diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-08-11 10:13:55 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-08-11 10:13:55 +0800 |
| commit | 5725bd2cc0e691dadc31bd958f210b1bbcf17c49 (patch) | |
| tree | a8faec22f21eff83d918076adcc9c8c49c4cc820 /lisp/emacs-lisp/autoload.el | |
| parent | 5723992258a8025e29ba9fcae923182fb5456426 (diff) | |
| parent | 711f4590cddbc83c509c1c5e852ef4e528a39780 (diff) | |
| download | emacs-5725bd2cc0e691dadc31bd958f210b1bbcf17c49.tar.gz | |
Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 3fc185dda25..e6e2d1e60e0 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -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))) |