From: Noah Friedman Date: Fri, 6 May 2011 19:59:17 +0000 (-0700) Subject: apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column when it... X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~83 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=275b59b05de94c37ae17273fe6029b487857c3a8;p=emacs.git apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column when it is bound to an integer, per that variable's documentation. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce62ee3cccf..00be139d111 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-05-06 Noah Friedman + + * 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 * lpr.el (print-region-1): Echo lpr-program's output, so error messages diff --git a/lisp/apropos.el b/lisp/apropos.el index f1baee8dafe..d3d66f2a070 100644 --- 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)))))