Attachment 603943 Details for Bug 847698 – Provided (from [2]) upstream patch for v24.1 version

[patch] Provided (from [2]) upstream patch for v24.1 version

local-vars-patch-24.1.patch (text/plain), 1.37 KB, created by Jan Lieskovsky on 2012-08-13 09:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Lieskovsky

Created: 2012-08-13 09:57:32 UTC

Size: 1.37 KB

patch

obsolete

>*** emacs-24.1/lisp/files.el~	2012-08-13 10:54:50.256181658 +0800
>--- emacs-24.1/lisp/files.el	2012-08-13 10:54:58.076181990 +0800
>***************
>*** 3107,3117 ****
>  	      ;; Obey `enable-local-eval'.
>  	      ((eq var 'eval)
>  	       (when enable-local-eval
>! 		 (push elt all-vars)
>! 		 (or (eq enable-local-eval t)
>! 		     (hack-one-local-variable-eval-safep (eval (quote val)))
>! 		     (safe-local-variable-p var val)
>! 		     (push elt unsafe-vars))))
>  	      ;; Ignore duplicates (except `mode') in the present list.
>  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
>  	      ;; Accept known-safe variables.
>--- 3107,3122 ----
>  	      ;; Obey `enable-local-eval'.
>  	      ((eq var 'eval)
>  	       (when enable-local-eval
>! 		 (let ((safe (or (hack-one-local-variable-eval-safep
>! 				  (eval (quote val)))
>! 				 ;; In case previously marked safe (bug#5636).
>! 				 (safe-local-variable-p var val))))
>! 		   ;; If not safe and e-l-v = :safe, ignore totally.
>! 		   (when (or safe (not (eq enable-local-variables :safe)))
>! 		     (push elt all-vars)
>! 		     (or (eq enable-local-eval t)
>! 			 safe
>! 			 (push elt unsafe-vars))))))
>  	      ;; Ignore duplicates (except `mode') in the present list.
>  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
>  	      ;; Accept known-safe variables.
>
>Diff finished.  Mon Aug 13 10:55:03 2012

Actions: View | Diff

Attachments on bug 847698: 603940 | 603943