diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 239f50c3c80..c5d8bfae7a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-02  Noah Friedman  <friedman@splode.com>
+
+	* emacs-lisp/bytecomp.el (byte-recompile-file): If bytecomp-arg is
+	nil, do not ask to recompile files that are not already compiled,
+	and do not recompile them.
+
 2010-11-02  Chong Yidong  <cyd@stupidchicken.com>
 
 	* emacs-lisp/package.el (package-initialize): Ensure that
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 952b69f7ce3..aec6bdb2f35 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1626,9 +1626,10 @@ or 'no-byte-compile if the file did not need recompilation."
             (or bytecomp-force
                 (file-newer-than-file-p bytecomp-filename
                                          bytecomp-dest))
-          (or (eq 0 bytecomp-arg)
-              (y-or-n-p (concat "Compile "
-                                bytecomp-filename "? "))))
+          (and bytecomp-arg
+               (or (eq 0 bytecomp-arg)
+                   (y-or-n-p (concat "Compile "
+                                     bytecomp-filename "? ")))))
         (progn
           (if (and noninteractive (not byte-compile-verbose))
               (message "Compiling %s..." bytecomp-filename))