From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Tue, 20 Jun 2017 03:46:21 +0000 (+0000)
Subject: Bind enable-local-variables to nil globally (fix dbe3e41)
X-Git-Tag: emacs-26.0.90~521^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d0b3a9548c816661be459d7edfd59d6f14ca713a;p=emacs.git

Bind enable-local-variables to nil globally (fix dbe3e41)

* lisp/gnus/mm-view.el (mm-display-inline-fontify):
Bind enable-local-variables to nil globally instead of making it
buffer-local; remove let-bind of local-enable-local-variables.
cf. <b4mtw3bbfp5.fsf@jpl.org> in the emacs-devel list.
---

diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 4276f9e9a43..9ff581da996 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -475,12 +475,12 @@ If MODE is not set, try to find mode automatically."
       (require 'font-lock)
       ;; I find font-lock a bit too verbose.
       (let ((font-lock-verbose nil)
-	    (font-lock-support-mode nil))
+	    (font-lock-support-mode nil)
+	    (enable-local-variables nil))
 	;; Disable support modes, e.g., jit-lock, lazy-lock, etc.
 	;; Note: XEmacs people use `font-lock-mode-hook' to run those modes.
 	(set (make-local-variable 'font-lock-mode-hook) nil)
         (setq buffer-file-name (mm-handle-filename handle))
-        (set (make-local-variable 'enable-local-variables) nil)
 	(with-demoted-errors
 	  (if mode
 	      (save-window-excursion
@@ -488,8 +488,7 @@ If MODE is not set, try to find mode automatically."
 		(funcall mode))
 	    (let ((auto-mode-alist
 		   (delq (rassq 'doc-view-mode-maybe auto-mode-alist)
-			 (copy-sequence auto-mode-alist)))
-		  (local-enable-local-variables nil))
+			 (copy-sequence auto-mode-alist))))
 	      (set-auto-mode)))
 	  ;; The mode function might have already turned on font-lock.
 	  ;; Do not fontify if the guess mode is fundamental.