From 7aacaf15a2ec7d17e75d94b902fa895d7d196026 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 9 Aug 2012 23:53:52 -0700 Subject: Disable local eval: in some places * tutorial.el (help-with-tutorial): * emacs-lisp/copyright.el (copyright-update-directory): * emacs-lisp/autoload.el (autoload-find-generated-file) (autoload-find-file): Disable local eval: (for insurance). --- lisp/emacs-lisp/autoload.el | 6 ++++-- lisp/emacs-lisp/copyright.el | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 5af666b9ded..e8dd9e8d1b4 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -201,7 +201,8 @@ or macro definition or a defcustom)." (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 @@ -355,7 +356,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))) diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 09b456b54ba..0da5b2abbb8 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -366,6 +366,7 @@ If FIX is non-nil, run `copyright-fix-years' instead." (find-file file) (let ((inhibit-read-only t) (enable-local-variables :safe) + (enable-local-eval nil) copyright-query) (if fix (copyright-fix-years) -- cgit v1.2.3 From fbb5e3364871172431e32b4b722d1e1fd6312330 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 9 Aug 2012 23:56:01 -0700 Subject: * lisp/emacs-lisp/copyright.el (copyright-update-directory): Logic fix. --- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/copyright.el | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 92afc1ab857..65017383de8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-08-10 Glenn Morris + * emacs-lisp/copyright.el (copyright-update-directory): Logic fix. + * tutorial.el (help-with-tutorial): * emacs-lisp/copyright.el (copyright-update-directory): * emacs-lisp/autoload.el (autoload-find-generated-file) diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index 0da5b2abbb8..889e3541455 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -363,11 +363,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) - (enable-local-eval nil) - 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))) -- cgit v1.2.3