Avoid some possible prompts from autoloads.el.

* lisp/emacs-lisp/autoload.el (autoload-save-buffers)
(autoload-find-destination, update-directory-autoloads):
Avoid prompts when updating autoloads.

2 files changed, 16 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33f39c00a60..28d09e7b2c8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-24  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/autoload.el (autoload-save-buffers)
+        (autoload-find-destination, update-directory-autoloads):
+        Avoid prompts when updating autoloads.
+
 2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/bytecomp.el (byte-compile-disable-print-circle): Obsolete.
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 7b610d11b0f..d6e7ee9e3cb 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -537,7 +537,8 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE
 (defun autoload-save-buffers ()
   (while autoload-modified-buffers
     (with-current-buffer (pop autoload-modified-buffers)
-      (save-buffer))))
+      (let ((version-control 'never))
+        (save-buffer)))))
 
 ;;;###autoload
 (defun update-file-autoloads (file &optional save-after)
@@ -569,8 +570,9 @@ removes any prior now out-of-date autoload entries."
       (with-current-buffer
           ;; We used to use `raw-text' to read this file, but this causes
           ;; problems when the file contains non-ASCII characters.
-          (find-file-noselect
-           (autoload-ensure-default-file (autoload-generated-file)))
+          (let ((enable-local-variables :safe))
+            (find-file-noselect
+             (autoload-ensure-default-file (autoload-generated-file))))
         ;; This is to make generated-autoload-file have Unix EOLs, so
         ;; that it is portable to all platforms.
         (or (eq 0 (coding-system-eol-type buffer-file-coding-system))
@@ -656,8 +658,9 @@ directory or directories specified."
          (autoload-modified-buffers nil))
 
     (with-current-buffer
-        (find-file-noselect
-         (autoload-ensure-default-file (autoload-generated-file)))
+        (let ((enable-local-variables :safe))
+          (find-file-noselect
+           (autoload-ensure-default-file (autoload-generated-file))))
       (save-excursion
 
         ;; Canonicalize file names and remove the autoload file itself.
@@ -721,7 +724,8 @@ directory or directories specified."
          (current-buffer) nil nil no-autoloads this-time)
         (insert generate-autoload-section-trailer))
 
-      (save-buffer)
+      (let ((version-control 'never))
+        (save-buffer))
       ;; In case autoload entries were added to other files because of
       ;; file-local autoload-generated-file settings.
       (autoload-save-buffers))))