summaryrefslogtreecommitdiff
path: root/lisp/progmodes/perl-mode.el
diff options
context:
space:
mode:
authorTed Zlatanov <tzz@lifelogs.com>2013-06-05 13:48:50 -0400
committerTed Zlatanov <tzz@lifelogs.com>2013-06-05 13:48:50 -0400
commit8fc57765e8baaf917734997b6bd3ca014613ad65 (patch)
treef42994d76b8818bbaff5da265510caf5cae46151 /lisp/progmodes/perl-mode.el
parentf019a684847950c24f5dd8ee8cfdd40d3511ba83 (diff)
downloademacs-8fc57765e8baaf917734997b6bd3ca014613ad65.tar.gz
emacs-8fc57765e8baaf917734997b6bd3ca014613ad65.tar.bz2
emacs-8fc57765e8baaf917734997b6bd3ca014613ad65.zip
Introduce and use prog-prettify-install.
Diffstat (limited to 'lisp/progmodes/perl-mode.el')
-rw-r--r--lisp/progmodes/perl-mode.el25
1 files changed, 4 insertions, 21 deletions
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index fb3839a5fbc..1d5052bede4 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -215,11 +215,6 @@
(defvar perl-font-lock-keywords perl-font-lock-keywords-1
"Default expressions to highlight in Perl mode.")
-;; Temporary variables used to add font-lock keywords dynamically.
-(defvar perl--augmented-font-lock-keywords)
-(defvar perl--augmented-font-lock-keywords-1)
-(defvar perl--augmented-font-lock-keywords-2)
-
(defvar perl-quote-like-pairs
'((?\( . ?\)) (?\[ . ?\]) (?\{ . ?\}) (?\< . ?\>)))
@@ -656,26 +651,14 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'."
(setq-local comment-indent-function #'perl-comment-indent)
(setq-local parse-sexp-ignore-comments t)
- ;; Define the symbols to be prettified.
- (setq-local prog-prettify-symbols-alist perl--prettify-symbols-alist)
-
;; Tell font-lock.el how to handle Perl.
- (setq perl--augmented-font-lock-keywords
- (append perl-font-lock-keywords
- (prog-prettify-font-lock-symbols-keywords)))
- (setq perl--augmented-font-lock-keywords-1
- (append perl-font-lock-keywords-1
- (prog-prettify-font-lock-symbols-keywords)))
- (setq perl--augmented-font-lock-keywords-2
- (append perl-font-lock-keywords-2
- (prog-prettify-font-lock-symbols-keywords)))
-
- (setq font-lock-defaults '((perl--augmented-font-lock-keywords
- perl--augmented-font-lock-keywords-1
- perl--augmented-font-lock-keywords-2)
+ (setq font-lock-defaults '((perl-font-lock-keywords
+ perl-font-lock-keywords-1
+ perl-font-lock-keywords-2)
nil nil ((?\_ . "w")) nil
(font-lock-syntactic-face-function
. perl-font-lock-syntactic-face-function)))
+ (prog-prettify-install perl--prettify-symbols-alist)
(setq-local syntax-propertize-function #'perl-syntax-propertize-function)
(add-hook 'syntax-propertize-extend-region-functions
#'syntax-propertize-multiline 'append 'local)