Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/emacs/patches/eval_file_local_var.patch
author Ali Bahrami <Ali.Bahrami@Oracle.COM>
Wed, 13 Mar 2013 19:01:31 -0600
branchs11-update
changeset 2523 f99c0e9ebba7
permissions -rw-r--r--
15810316 problem in UTILITY/EMACS 16171813 emacs rgrep assumes gnu find in path; fails using GNU-specific options 16246357 emacs -nw hangs on startup starting with s12_14
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2523
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     1
 
*** emacs-23.4.orig/lisp/files.el	Wed Jan 11 05:35:01 2012
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     2
 
--- emacs-23.4/lisp/files.el	Fri Feb  1 13:21:50 2013
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     3
 
***************
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     4
 
*** 2986,2996 ****
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     5
 
  	      ;; Obey `enable-local-eval'.
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     6
 
  	      ((eq var 'eval)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     7
 
  	       (when enable-local-eval
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     8
 
! 		 (push elt all-vars)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
     9
 
! 		 (or (eq enable-local-eval t)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    10
 
! 		     (hack-one-local-variable-eval-safep (eval (quote val)))
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    11
 
! 		     (safe-local-variable-p var val)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    12
 
! 		     (push elt unsafe-vars))))
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    13
 
  	      ;; Ignore duplicates (except `mode') in the present list.
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    14
 
  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    15
 
  	      ;; Accept known-safe variables.
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    16
 
--- 2986,3001 ----
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    17
 
  	      ;; Obey `enable-local-eval'.
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    18
 
  	      ((eq var 'eval)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    19
 
  	       (when enable-local-eval
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    20
 
! 		 (let ((safe (or (hack-one-local-variable-eval-safep
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    21
 
! 				  (eval (quote val)))
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    22
 
! 				 ;; In case previously marked safe (bug#5636).
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    23
 
! 				 (safe-local-variable-p var val))))
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    24
 
! 		   ;; If not safe and e-l-v = :safe, ignore totally.
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    25
 
! 		   (when (or safe (not (eq enable-local-variables :safe)))
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    26
 
! 		     (push elt all-vars)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    27
 
! 		     (or (eq enable-local-eval t)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    28
 
! 			 safe
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    29
 
! 			 (push elt unsafe-vars))))))
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    30
 
  	      ;; Ignore duplicates (except `mode') in the present list.
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    31
 
  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
f99c0e9ebba7 15810316 problem in UTILITY/EMACS
Ali Bahrami <Ali.Bahrami@Oracle.COM>
parents:
diff changeset 
    32
 
  	      ;; Accept known-safe variables.
upstream/oracle/userland-gate