summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2006-06-20 22:22:33 +0000
committerChong Yidong <cyd@stupidchicken.com>2006-06-20 22:22:33 +0000
commita548f3d70aa278c79a3801e48d355a3318a40869 (patch)
treecf82d4bfac52a3030eaae1c3892b02c5f17a3d28
parent3c6b81d8713cffb7c387e5dc660eae4d3be0368f (diff)
downloademacs-a548f3d70aa278c79a3801e48d355a3318a40869.tar.gz
* files.el (hack-local-variables): Run `hack-local-variables-hook'
whether or not a local variables list is defined.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/files.el4
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3621a356b2..60f89b8a4b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -13,6 +13,9 @@
2006-06-20 Chong Yidong <cyd@stupidchicken.com>
+ * files.el (hack-local-variables): Run `hack-local-variables-hook'
+ whether or not a local variables list is defined.
+
* msb.el (msb): Move `sit-for' hack here to handle both
"mouse-down and drag" and "mouse-up and select" situations.
(mouse-select-buffer): Move `sit-for' hack to `msb'.
diff --git a/lisp/files.el b/lisp/files.el
index 8a5a331da71..659b34640c4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2665,8 +2665,8 @@ is specified, returning t if it is specified."
(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))))))
+ (hack-one-local-variable (car elt) (cdr elt)))))))
+ (run-hooks 'hack-local-variables-hook)))))
(defun safe-local-variable-p (sym val)
"Non-nil if SYM is safe as a file-local variable with value VAL.