[Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/10/22 17:28:56

Index: progmodes/cperl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cperl-mode.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- progmodes/cperl-mode.el     11 Oct 2006 06:47:35 -0000      1.80
+++ progmodes/cperl-mode.el     22 Oct 2006 17:28:56 -0000      1.81
@@ -1835,7 +1835,7 @@
   (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,9 +5708,12 @@
 
 (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))
+  (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 ()
@@ -5720,7 +5723,7 @@
     (if (fboundp 'eval-after-load)
        (eval-after-load
            "ps-print"
-         '(or cperl-faces-init (cperl-init-faces))))))
+              '(or cperl-faces-init (cperl-init-faces)))))))
 
 (defvar cperl-font-lock-keywords-1 nil
   "Additional expressions to highlight in Perl mode.  Minimal set.")