X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4ef177aa26537bdbbe9d60cc87b973435390c271..c5cde04220c3961df41d290dfe3ddbcba821fa26:/lisp/apropos.el

diff --git a/lisp/apropos.el b/lisp/apropos.el
index f1baee8daf..d3d66f2a07 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)))))