(cperl-perldoc): Require man before binding `manual-program'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41ad6a07afcad030f522b1c02524e298466a54ff..4aba7f98c2f5bbc84b35d00cece0e603eb43e383 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-20  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * progmodes/cperl-mode.el (cperl-perldoc): Require man before binding
+       `manual-program'.
+
 2001-11-19  Stefan Monnier  <monnier@cs.yale.edu>
 
        * progmodes/cc-engine.el (c-parse-state): Typo. From Martin Stjernholm.

diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 42377f5beb6e0081a8567dc9201b5769b24ade90..94451abf1ec446400ef749114db13f3fa23fa3ae 100644 (file)
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -6770,6 +6770,7 @@ We suppose that the regexp is scanned already."
                    (error "No perldoc args given")
                  default-entry)
              input))))
+  (require 'man)
   (let* ((is-func (and
                   (string-match "^[a-z]+$" word)
                   (string-match (concat "^" word "\\>")
@@ -6777,7 +6778,6 @@ We suppose that the regexp is scanned already."
                                  'cperl-short-docs
                                  'variable-documentation))))
         (manual-program (if is-func "perldoc -f" "perldoc")))
-    (require 'man)
     (Man-getpage-in-background word)))
 
 (defun cperl-perldoc-at-point ()