mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

* progmodes/cperl-mode.el (cperl-mode): Don't assume

Browse Source 
font-lock-multiline is auto-local (it's not).
	(cperl-windowed-init): Ensure that cperl-font-lock-multiline is
	initialized before calling cperl-init-faces.
This commit is contained in:
Chong Yidong 2006-10-22 17:28:56 +00:00
parent 57d8692df7
commit f453f5a8cd
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2006-10-22 Chong Yidong <cyd@stupidchicken.com>
* progmodes/cperl-mode.el (cperl-mode): Don't assume
font-lock-multiline is auto-local (it's not).
(cperl-windowed-init): Ensure that cperl-font-lock-multiline is
initialized before calling cperl-init-faces.
2006-10-22 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-info-stack-custom): Don't try to give

31
lisp/progmodes/cperl-mode.el
View File

@ -1835,7 +1835,7 @@ or as help on variables `cperl-tips', `cperl-problems',
(if (boundp 'font-lock-multiline) ; Newer font-lock; use its facilities
(progn
(setq cperl-font-lock-multiline t) ; Not localized...
(set 'font-lock-multiline t)) ; not present with old Emacs; auto-local
(set (make-local-variable 'font-lock-multiline) t))
(make-local-variable 'font-lock-fontify-region-function)
(set 'font-lock-fontify-region-function ; not present with old Emacs
'cperl-font-lock-fontify-region-function))
@ -5708,19 +5708,22 @@ indentation and initial hashes. Behaves usually outside of comment."
(defun cperl-windowed-init ()
"Initialization under windowed version."
(if (or (featurep 'ps-print) cperl-faces-init)
;; Need to init anyway:
(or cperl-faces-init (cperl-init-faces))
(add-hook 'font-lock-mode-hook
(function
(lambda ()
(if (memq major-mode '(perl-mode cperl-mode))
(progn
(or cperl-faces-init (cperl-init-faces)))))))
(if (fboundp 'eval-after-load)
(eval-after-load
"ps-print"
'(or cperl-faces-init (cperl-init-faces))))))
(cond ((featurep 'ps-print)
(unless cperl-faces-init
(if (boundp 'font-lock-multiline)
(setq cperl-font-lock-multiline t))
(cperl-init-faces)))
((not cperl-faces-init)
(add-hook 'font-lock-mode-hook
(function
(lambda ()
(if (memq major-mode '(perl-mode cperl-mode))
(progn
(or cperl-faces-init (cperl-init-faces)))))))
(if (fboundp 'eval-after-load)
(eval-after-load
"ps-print"
'(or cperl-faces-init (cperl-init-faces)))))))
(defvar cperl-font-lock-keywords-1 nil
"Additional expressions to highlight in Perl mode. Minimal set.")