[Emacs-diffs] /srv/bzr/emacs/trunk r103408: Avoid some possible prompts from autoloads.el.

[Glenn Morris]

------------------------------------------------------------
revno: 103408
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-02-23 19:53:27 -0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/autoload.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-23 15:22:28 +0000
+++ b/lisp/ChangeLog    2011-02-24 03:53:27 +0000
@@ -1,3 +1,9 @@
+2011-02-24  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/autoload.el (autoload-save-buffers)
+       (autoload-find-destination, update-directory-autoloads):
+       Avoid prompts when updating autoloads.
+
 2011-02-23  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/bytecomp.el (byte-compile-disable-print-circle): Obsolete.

=== modified file 'lisp/emacs-lisp/autoload.el'
--- a/lisp/emacs-lisp/autoload.el       2011-01-26 08:36:39 +0000
+++ b/lisp/emacs-lisp/autoload.el       2011-02-24 03:53:27 +0000
@@ -537,7 +537,8 @@
 (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 @@
       (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 @@
          (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 @@
         (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))))