[Emacs-diffs] /srv/bzr/emacs/trunk r104143: apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column when it is bound to an integer, per that variable's documentation.

[Noah Friedman]

------------------------------------------------------------
revno: 104143
committer: Noah Friedman <address@hidden>
branch nick: trunk
timestamp: Fri 2011-05-06 12:59:17 -0700
message:
  apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column 
when it is bound to an integer, per that variable's documentation.
modified:
  lisp/ChangeLog
  lisp/apropos.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-06 16:38:02 +0000
+++ b/lisp/ChangeLog    2011-05-06 19:59:17 +0000
@@ -1,3 +1,9 @@
+2011-05-06  Noah Friedman  <address@hidden>
+
+       * 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  <address@hidden>
 
        * lpr.el (print-region-1): Echo lpr-program's output, so error messages

=== modified file 'lisp/apropos.el'
--- a/lisp/apropos.el   2011-04-24 00:15:26 +0000
+++ b/lisp/apropos.el   2011-05-06 19:59:17 +0000
@@ -1133,7 +1133,9 @@
            (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)))))