diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-24 22:42:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-24 22:42:06 -0800 |
| commit | a07b892ff17e95e513c4bfe6e2dd73df1e589bf3 (patch) | |
| tree | a3d1a40c919618c9a452a405838cff23819777fe /lisp/emacs-lisp | |
| parent | ae0d725005539d9259efac6a81ff8fdd45eb69a6 (diff) | |
| parent | b18947669cd182ec8487b317460f6df5878d0f11 (diff) | |
| download | emacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.tar.gz emacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.tar.bz2 emacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 16 | ||||
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 1 |
2 files changed, 11 insertions, 6 deletions
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)))) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 199927d536e..2f113dfb479 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -227,6 +227,7 @@ the functions you loaded will not be able to run.") (defvar byte-compile-disable-print-circle nil "If non-nil, disable `print-circle' on printing a byte-compiled code.") +(make-obsolete-variable 'byte-compile-disable-print-circle nil "24.1") ;;;###autoload(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) (defcustom byte-compile-dynamic-docstrings t |