summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2006-10-22 21:00:25 +0000
committerChong Yidong <cyd@stupidchicken.com>2006-10-22 21:00:25 +0000
commit224ca9c976305d1fa2d3d1c38dbd2e687488b167 (patch)
treee9b0c4945a1a6b0f524429dbafc16ddd9f38e67c
parent7a338befad5fe10f592c0e432e7112dec8dd3d4c (diff)
downloademacs-224ca9c976305d1fa2d3d1c38dbd2e687488b167.tar.gz
* progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/cperl-mode.el8
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9712ccc2176..ba5843541a4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-22 martin rudalics <rudalics@gmx.at>
+
+ * progmodes/cperl-mode.el (cperl-invalid-face): Fix defcustom.
+
2006-10-22 John Wiegley <johnw@newartisans.com>
* progmodes/python.el (python-use-skeletons): python-mode was
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index f31bbdcc162..26bbb8f3faf 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -445,12 +445,8 @@ Font for POD headers."
;;; Some double-evaluation happened with font-locks... Needed with 21.2...
(defvar cperl-singly-quote-face cperl-xemacs-p)
-(defcustom cperl-invalid-face ; Does not customize with '' on XEmacs
- (if cperl-singly-quote-face
- 'underline ''underline) ; On older Emacsen was evaluated by `font-lock'
- (if cperl-singly-quote-face
- "*This face is used for highlighting trailing whitespace."
- "*Face for highlighting trailing whitespace.")
+(defcustom cperl-invalid-face 'underline
+ "*Face for highlighting trailing whitespace."
:type 'face
:version "21.1"
:group 'cperl-faces)