diff options
author | Noah Friedman <friedman@splode.com> | 2011-05-06 12:59:17 -0700 |
---|---|---|
committer | Noah Friedman <friedman@splode.com> | 2011-05-06 12:59:17 -0700 |
commit | 275b59b05de94c37ae17273fe6029b487857c3a8 (patch) | |
tree | 1464d8e3dc1b9bc9426d17e924550a4c2aa8898b /lisp/apropos.el | |
parent | 6c19f744bb93693e848d4045891733688cbcb9eb (diff) | |
download | emacs-275b59b05de94c37ae17273fe6029b487857c3a8.tar.gz |
apropos.el (apropos-print-doc): Only use emacs-lisp-docstring-fill-column when it is bound to an integer, per that variable's documentation.
Diffstat (limited to 'lisp/apropos.el')
-rw-r--r-- | lisp/apropos.el | 4 |
1 files changed, 3 insertions, 1 deletions
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))))) |