Mercurial > emacs

comparison lisp/progmodes/cperl-mode.el @ 83545:034f67f59091

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-479 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-480 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-481 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-482 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-483 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-484 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-485 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-153 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-154 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-155 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 12:25:18 +0000
parents c09fdf139d4a
children 9bcc33b6d297 7eeafaaa9eab
comparison
equal deleted inserted replaced
83544:58cf725f5330 83545:034f67f59091
443 :group 'cperl-faces) 443 :group 'cperl-faces)
444 444
445 ;;; Some double-evaluation happened with font-locks... Needed with 21.2... 445 ;;; Some double-evaluation happened with font-locks... Needed with 21.2...
446 (defvar cperl-singly-quote-face cperl-xemacs-p) 446 (defvar cperl-singly-quote-face cperl-xemacs-p)
447 447
448 (defcustom cperl-invalid-face ; Does not customize with '' on XEmacs 448 (defcustom cperl-invalid-face 'underline
449 (if cperl-singly-quote-face 449 "*Face for highlighting trailing whitespace."
450 'underline ''underline) ; On older Emacsen was evaluated by `font-lock'
451 (if cperl-singly-quote-face
452 "*This face is used for highlighting trailing whitespace."
453 "*Face for highlighting trailing whitespace.")
454 :type 'face 450 :type 'face
455 :version "21.1" 451 :version "21.1"
456 :group 'cperl-faces) 452 :group 'cperl-faces)
457 453
458 (defcustom cperl-pod-here-fontify '(featurep 'font-lock) 454 (defcustom cperl-pod-here-fontify '(featurep 'font-lock)
1833 ;; are defined. 1829 ;; are defined.
1834 '(t))))) 1830 '(t)))))
1835 (if (boundp 'font-lock-multiline) ; Newer font-lock; use its facilities 1831 (if (boundp 'font-lock-multiline) ; Newer font-lock; use its facilities
1836 (progn 1832 (progn
1837 (setq cperl-font-lock-multiline t) ; Not localized... 1833 (setq cperl-font-lock-multiline t) ; Not localized...
1838 (set 'font-lock-multiline t)) ; not present with old Emacs; auto-local 1834 (set (make-local-variable 'font-lock-multiline) t))
1839 (make-local-variable 'font-lock-fontify-region-function) 1835 (make-local-variable 'font-lock-fontify-region-function)
1840 (set 'font-lock-fontify-region-function ; not present with old Emacs 1836 (set 'font-lock-fontify-region-function ; not present with old Emacs
1841 'cperl-font-lock-fontify-region-function)) 1837 'cperl-font-lock-fontify-region-function))
1842 (make-local-variable 'font-lock-fontify-region-function) 1838 (make-local-variable 'font-lock-fontify-region-function)
1843 (set 'font-lock-fontify-region-function ; not present with old Emacs 1839 (set 'font-lock-fontify-region-function ; not present with old Emacs
5706 "Alist that specifies how to match errors in perl output.") 5702 "Alist that specifies how to match errors in perl output.")
5707 5703
5708 5704
5709 (defun cperl-windowed-init () 5705 (defun cperl-windowed-init ()
5710 "Initialization under windowed version." 5706 "Initialization under windowed version."
5711 (if (or (featurep 'ps-print) cperl-faces-init) 5707 (cond ((featurep 'ps-print)
5712 ;; Need to init anyway: 5708 (unless cperl-faces-init
5713 (or cperl-faces-init (cperl-init-faces)) 5709 (if (boundp 'font-lock-multiline)
5714 (add-hook 'font-lock-mode-hook 5710 (setq cperl-font-lock-multiline t))
5715 (function 5711 (cperl-init-faces)))
5716 (lambda () 5712 ((not cperl-faces-init)
5717 (if (memq major-mode '(perl-mode cperl-mode)) 5713 (add-hook 'font-lock-mode-hook
5718 (progn 5714 (function
5719 (or cperl-faces-init (cperl-init-faces))))))) 5715 (lambda ()
5720 (if (fboundp 'eval-after-load) 5716 (if (memq major-mode '(perl-mode cperl-mode))
5721 (eval-after-load 5717 (progn
5722 "ps-print" 5718 (or cperl-faces-init (cperl-init-faces)))))))
5723 '(or cperl-faces-init (cperl-init-faces)))))) 5719 (if (fboundp 'eval-after-load)
5720 (eval-after-load
5721 "ps-print"
5722 '(or cperl-faces-init (cperl-init-faces)))))))
5724 5723
5725 (defvar cperl-font-lock-keywords-1 nil 5724 (defvar cperl-font-lock-keywords-1 nil
5726 "Additional expressions to highlight in Perl mode. Minimal set.") 5725 "Additional expressions to highlight in Perl mode. Minimal set.")
5727 (defvar cperl-font-lock-keywords nil 5726 (defvar cperl-font-lock-keywords nil
5728 "Additional expressions to highlight in Perl mode. Default set.") 5727 "Additional expressions to highlight in Perl mode. Default set.")