aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/files.el14
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/files.el b/lisp/files.el
index ca03ee8726b..cd474e868d0 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2689,12 +2689,14 @@ It is dangerous if either of these conditions are met:
2689 (and (eq (car exp) 'put) 2689 (and (eq (car exp) 'put)
2690 (hack-one-local-variable-quotep (nth 1 exp)) 2690 (hack-one-local-variable-quotep (nth 1 exp))
2691 (hack-one-local-variable-quotep (nth 2 exp)) 2691 (hack-one-local-variable-quotep (nth 2 exp))
2692 (memq (nth 1 (nth 2 exp)) 2692 (let ((prop (nth 1 (nth 2 exp))) (val (nth 3 exp)))
2693 '(lisp-indent-hook)) 2693 (cond ((eq prop 'lisp-indent-hook)
2694 ;; Only allow safe values of lisp-indent-hook; 2694 ;; Only allow safe values of lisp-indent-hook;
2695 ;; not functions. 2695 ;; not functions.
2696 (or (numberp (nth 3 exp)) 2696 (or (numberp val) (equal val ''defun)))
2697 (equal (nth 3 exp) ''defun))) 2697 ((eq prop 'edebug-form-spec)
2698 ;; Only allow indirect form specs.
2699 (edebug-basic-spec val)))))
2698 ;; Allow expressions that the user requested. 2700 ;; Allow expressions that the user requested.
2699 (member exp safe-local-eval-forms) 2701 (member exp safe-local-eval-forms)
2700 ;; Certain functions can be allowed with safe arguments 2702 ;; Certain functions can be allowed with safe arguments