(cperl-msb-fix, cperl-get-help-defer):

Check major-mode for `cperl-mode' as well.

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 89ffe55e15cfe4f6cf5ce6d83a2e60f32e365700..5b5400a81ce8748e7c2146f1a62f63a8db94812b 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1558,7 +1558,7 @@ or as help on variables `cperl-tips', `cperl-problems',
         (handle (1- (nth 1 last))))
     (setcdr precdr (list
                    (list
-                    '(eq major-mode 'perl-mode)
+                    '(memq major-mode '(cperl-mode perl-mode))
                     handle
                     "Perl Files (%d)")
                    last))))
@@ -4299,9 +4299,7 @@ indentation and initial hashes.  Behaves usually outside of comment."
     (add-hook 'font-lock-mode-hook
              (function
               (lambda ()
-                (if (or
-                     (eq major-mode 'perl-mode)
-                     (eq major-mode 'cperl-mode))
+                (if (memq major-mode '(perl-mode cperl-mode))
                     (progn
                       (or cperl-faces-init (cperl-init-faces)))))))
     (if (fboundp 'eval-after-load)
@@ -6855,7 +6853,7 @@ We suppose that the regexp is scanned already."
        (setq cperl-help-shown nil))
 
       (defun cperl-get-help-defer ()
-       (if (not (eq major-mode 'perl-mode)) nil
+       (when (memq major-mode '(perl-mode cperl-mode))
          (let ((cperl-message-on-help-error nil) (cperl-help-from-timer t))
            (cperl-get-help)
            (setq cperl-help-shown t))))