diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 13d563bde91868cd92527e98463f4fa1e27c32b1..b917b713c06c776540c0d6cec6b4db80260a79b0 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1601,7 +1601,10 @@ extra args."
 	   (while syms
 	     (setq s (symbol-name (pop syms))
 		   L (+ L (length s) 2))
-	     (if (< L (1- fill-column))
+	     (if (< L (1- (buffer-local-value 'fill-column
+                                              (or (get-buffer
+                                                   byte-compile-log-buffer)
+                                                  (current-buffer)))))
 		 (setq str (concat str " " s (and syms ",")))
 	       (setq str (concat str "\n    " s (and syms ","))
 		     L (+ (length s) 4))))