(do-auto-fill): No-op if (current-fill-column) is nil.

diff --git a/lisp/simple.el b/lisp/simple.el
index 60244e59a4f60ff4183c330f2fcce61ead0de329..e5eb212fe46e30337c2390d516d776fa76f9378e 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2330,9 +2330,9 @@ Setting this variable automatically makes it local to the current buffer.")
 (defun do-auto-fill ()
   (let (fc justify bol give-up)
     (if (or (not (setq justify (current-justification)))
-           (and (setq fc (current-fill-column)) ; make sure this gets set
-                (eq justify 'left)
-                (<= (current-column) (setq fc (current-fill-column))))
+           (null (setq fc (current-fill-column)))
+           (and (eq justify 'left)
+                (<= (current-column) fc))
            (save-excursion (beginning-of-line) 
                            (setq bol (point))
                            (and auto-fill-inhibit-regexp