aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-10-12 13:10:22 +0000
committerDave Love2000-10-12 13:10:22 +0000
commit8661c643dbe2480e3d9faaec05db96297cca5198 (patch)
treed91a60d02dc6968961914b9227a0287e84feb2ef
parent2483cf581bf1378059e09147c1061045aabadab0 (diff)
downloademacs-8661c643dbe2480e3d9faaec05db96297cca5198.tar.gz
emacs-8661c643dbe2480e3d9faaec05db96297cca5198.zip
(cperl-tips-faces): Doc fix.
(cperl-invalid-face): Revert last change. (cperl-init-faces): Quote cperl-invalid-face.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/cperl-mode.el24
2 files changed, 18 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28bfe56eeea..20cd22240d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12000-10-12 Dave Love <fx@gnu.org>
2
3 * progmodes/cperl-mode.el (cperl-tips-faces): Doc fix.
4 (cperl-invalid-face): Revert last change.
5 (cperl-init-faces): Quote cperl-invalid-face.
6
12000-10-12 Kenichi Handa <handa@etl.go.jp> 72000-10-12 Kenichi Handa <handa@etl.go.jp>
2 8
3 * startup.el (fancy-splash-text): Remove superfluous quote. 9 * startup.el (fancy-splash-text): Remove superfluous quote.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 2aecc92dc71..64b6574d0d2 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -849,27 +849,27 @@ B) Speed of editing operations.
849(defvar cperl-tips-faces 'please-ignore-this-line 849(defvar cperl-tips-faces 'please-ignore-this-line
850 "CPerl mode uses following faces for highlighting: 850 "CPerl mode uses following faces for highlighting:
851 851
852 cperl-array-face Array names 852 `cperl-array-face' Array names
853 cperl-hash-face Hash names 853 `cperl-hash-face' Hash names
854 font-lock-comment-face Comments, PODs and whatever is considered 854 `font-lock-comment-face' Comments, PODs and whatever is considered
855 syntaxically to be not code 855 syntaxically to be not code
856 font-lock-constant-face HERE-doc delimiters, labels, delimiters of 856 `font-lock-constant-face' HERE-doc delimiters, labels, delimiters of
857 2-arg operators s/y/tr/ or of RExen, 857 2-arg operators s/y/tr/ or of RExen,
858 font-lock-function-name-face Special-cased m// and s//foo/, _ as 858 `font-lock-function-name-face' Special-cased m// and s//foo/, _ as
859 a target of a file tests, file tests, 859 a target of a file tests, file tests,
860 subroutine names at the moment of definition 860 subroutine names at the moment of definition
861 (except those conflicting with Perl operators), 861 (except those conflicting with Perl operators),
862 package names (when recognized), format names 862 package names (when recognized), format names
863 font-lock-keyword-face Control flow switch constructs, declarators 863 `font-lock-keyword-face' Control flow switch constructs, declarators
864 cperl-nonoverridable-face Non-overridable keywords, modifiers of RExen 864 `cperl-nonoverridable-face' Non-overridable keywords, modifiers of RExen
865 font-lock-string-face Strings, qw() constructs, RExen, POD sections, 865 `font-lock-string-face' Strings, qw() constructs, RExen, POD sections,
866 literal parts and the terminator of formats 866 literal parts and the terminator of formats
867 and whatever is syntaxically considered 867 and whatever is syntaxically considered
868 as string literals 868 as string literals
869 font-lock-type-face Overridable keywords 869 `font-lock-type-face' Overridable keywords
870 font-lock-variable-name-face Variable declarations, indirect array and 870 `font-lock-variable-name-face' Variable declarations, indirect array and
871 hash names, POD headers/item names 871 hash names, POD headers/item names
872 cperl-invalid-face Trailing whitespace 872 `cperl-invalid-face' Trailing whitespace
873 873
874Note that in several situations the highlighting tries to inform about 874Note that in several situations the highlighting tries to inform about
875possible confusion, such as different colors for function names in 875possible confusion, such as different colors for function names in
@@ -4341,7 +4341,7 @@ indentation and initial hashes. Behaves usually outside of comment."
4341 (setq 4341 (setq
4342 t-font-lock-keywords 4342 t-font-lock-keywords
4343 (list 4343 (list
4344 (list "[ \t]+$" 0 cperl-invalid-face t) 4344 (list "[ \t]+$" 0 'cperl-invalid-face t)
4345 (cons 4345 (cons
4346 (concat 4346 (concat
4347 "\\(^\\|[^$@%&\\]\\)\\<\\(" 4347 "\\(^\\|[^$@%&\\]\\)\\<\\("