[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/files.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/files.el |
Date: |
Tue, 14 Feb 2006 03:47:00 +0000 |
Index: emacs/lisp/files.el
diff -u emacs/lisp/files.el:1.807 emacs/lisp/files.el:1.808
--- emacs/lisp/files.el:1.807 Tue Feb 14 01:21:31 2006
+++ emacs/lisp/files.el Tue Feb 14 03:47:00 2006
@@ -2439,34 +2439,35 @@
;; variables (if MODE-ONLY is nil.)
(if mode-only
result
- (setq result (nreverse result))
- (dolist (ignored ignored-local-variables)
- (setq result (assq-delete-all ignored result)))
- (if (null enable-local-eval)
- (setq result (assq-delete-all 'eval result)))
- ;; Find those variables that we may want to save to
- ;; `safe-local-variable-values'.
- (let (risky-vars unsafe-vars)
- (dolist (elt result)
- (let ((var (car elt))
- (val (cdr elt)))
- (or (eq var 'mode)
- (and (eq var 'eval)
- (or (eq enable-local-eval t)
- (hack-one-local-variable-eval-safep
- (eval (quote val)))))
- (safe-local-variable-p var val)
- (and (risky-local-variable-p var val)
- (push elt risky-vars))
- (push elt unsafe-vars))))
- (if (or (and (eq enable-local-variables t)
- (null unsafe-vars)
- (null risky-vars))
- (hack-local-variables-confirm
- result unsafe-vars risky-vars))
- (dolist (elt result)
- (hack-one-local-variable (car elt) (cdr elt)))))
- (run-hooks 'hack-local-variables-hook)))))
+ (when result
+ (setq result (nreverse result))
+ (dolist (ignored ignored-local-variables)
+ (setq result (assq-delete-all ignored result)))
+ (if (null enable-local-eval)
+ (setq result (assq-delete-all 'eval result)))
+ ;; Find those variables that we may want to save to
+ ;; `safe-local-variable-values'.
+ (let (risky-vars unsafe-vars)
+ (dolist (elt result)
+ (let ((var (car elt))
+ (val (cdr elt)))
+ (or (eq var 'mode)
+ (and (eq var 'eval)
+ (or (eq enable-local-eval t)
+ (hack-one-local-variable-eval-safep
+ (eval (quote val)))))
+ (safe-local-variable-p var val)
+ (and (risky-local-variable-p var val)
+ (push elt risky-vars))
+ (push elt unsafe-vars))))
+ (if (or (and (eq enable-local-variables t)
+ (null unsafe-vars)
+ (null risky-vars))
+ (hack-local-variables-confirm
+ result unsafe-vars risky-vars))
+ (dolist (elt result)
+ (hack-one-local-variable (car elt) (cdr elt)))))
+ (run-hooks 'hack-local-variables-hook))))))
(defvar ignored-local-variables
'(ignored-local-variables safe-local-variable-values)
- [Emacs-diffs] Changes to emacs/lisp/files.el, Kim F. Storm, 2006/02/04
- [Emacs-diffs] Changes to emacs/lisp/files.el, Thien-Thi Nguyen, 2006/02/06
- [Emacs-diffs] Changes to emacs/lisp/files.el, Eli Zaretskii, 2006/02/11
- [Emacs-diffs] Changes to emacs/lisp/files.el, Richard M. Stallman, 2006/02/12
- [Emacs-diffs] Changes to emacs/lisp/files.el, Chong Yidong, 2006/02/13
- [Emacs-diffs] Changes to emacs/lisp/files.el,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/lisp/files.el, Chong Yidong, 2006/02/14
- [Emacs-diffs] Changes to emacs/lisp/files.el, Chong Yidong, 2006/02/14
- [Emacs-diffs] Changes to emacs/lisp/files.el, Chong Yidong, 2006/02/14
- [Emacs-diffs] Changes to emacs/lisp/files.el, Reiner Steib, 2006/02/17
- [Emacs-diffs] Changes to emacs/lisp/files.el, Chong Yidong, 2006/02/17
- [Emacs-diffs] Changes to emacs/lisp/files.el, Richard M. Stallman, 2006/02/21