procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com

Browse source
This commit is contained in:
Chong Yidong 2012-08-11 10:13:55 +08:00
commit 5725bd2cc0
12 changed files with 158 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/emacs-lisp/autoload.el
View file

@ -228,7 +228,8 @@ expression, in which case we want to handle forms differently."
(defun autoload-find-generated-file ()
"Visit the autoload file for the current buffer, and return its buffer.
If a buffer is visiting the desired autoload file, return it."
(let ((enable-local-variables :safe))
(let ((enable-local-variables :safe)
(enable-local-eval nil))
;; We used to use `raw-text' to read this file, but this causes
;; problems when the file contains non-ASCII characters.
(find-file-noselect
@ -382,7 +383,8 @@ which lists the file name and which functions are in it, etc."
(emacs-lisp-mode)
(setq default-directory (file-name-directory file))
(insert-file-contents file nil)
(let ((enable-local-variables :safe))
(let ((enable-local-variables :safe)
(enable-local-eval nil))
(hack-local-variables))
(current-buffer)))

9
lisp/emacs-lisp/copyright.el
View file

@ -362,10 +362,11 @@ If FIX is non-nil, run `copyright-fix-years' instead."
(dolist (file (directory-files directory t match nil))
(unless (file-directory-p file)
(message "Updating file `%s'" file)
(find-file file)
(let ((inhibit-read-only t)
(enable-local-variables :safe)
copyright-query)
;; FIXME we should not use find-file+save+kill.
(let ((enable-local-variables :safe)
(enable-local-eval nil))
(find-file file))
(let ((inhibit-read-only t))
(if fix
(copyright-fix-years)
(copyright-update)))