apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column when it...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce62ee3cccfab40c23db27264f85fc23ae0f4a5f..00be139d1112cd5b92dbde167ff64e32c74310b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-06  Noah Friedman  <friedman@splode.com>
+
+       * apropos.el (apropos-print-doc): Only use
+       emacs-lisp-docstring-fill-column when it is bound to an integer,
+       per that variable's documentation.
+
 2011-05-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * lpr.el (print-region-1): Echo lpr-program's output, so error messages

diff --git a/lisp/apropos.el b/lisp/apropos.el
index f1baee8dafe4712c2b956bf8acf31c73e2cd2a24..d3d66f2a0703034a760a2263f663227de0321e9a 100644 (file)
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1133,7 +1133,9 @@ If non-nil TEXT is a string that will be printed as a heading."
            (put-text-property opoint (point) 'font-lock-face 'shadow))
        ;; The labeling buttons might make the line too long, so fill it if
        ;; necessary.
-       (let ((fill-column (+ 5 emacs-lisp-docstring-fill-column))
+       (let ((fill-column (+ 5 (if (integerp emacs-lisp-docstring-fill-column)
+                                    emacs-lisp-docstring-fill-column
+                                  fill-column)))
              (fill-prefix (make-string ocol ?\s)))
          (fill-region opoint (point) nil t)))
       (or (bolp) (terpri)))))