Commit e6ca43c8 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(hack-local-variables-confirm): New arg FLAG-TO-CHECK.

(hack-one-local-variable, hack-local-variables)
(hack-local-variables-prop-line): Pass that arg.

(locate-file-completion): Doc fix.
parent 14bc6e51
......@@ -658,7 +658,7 @@ one or more of those symbols."
(defun locate-file-completion (string path-and-suffixes action)
"Do completion for file names passed to `locate-file'.
PATH-AND-SUFFIXES is a pair of lists (DIRECTORIES . SUFFIXES)."
PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)."
(if (file-name-absolute-p string)
(read-file-name-internal string nil action)
(let ((names nil)
......@@ -2159,9 +2159,9 @@ Otherwise, return nil; point may be changed."
(goto-char beg)
end))))
(defun hack-local-variables-confirm (string)
(or (eq enable-local-variables t)
(and enable-local-variables
(defun hack-local-variables-confirm (string flag-to-check)
(or (eq flag-to-check t)
(and flag-to-check
(save-window-excursion
(condition-case nil
(switch-to-buffer (current-buffer))
......@@ -2236,7 +2236,8 @@ is specified, returning t if it is specified."
(if (and result
(or mode-only
(hack-local-variables-confirm
"Set local variables as specified in -*- line of %s? ")))
"Set local variables as specified in -*- line of %s? "
enable-local-variables)))
(let ((enable-local-eval enable-local-eval))
(while result
(hack-one-local-variable (car (car result)) (cdr (car result)))
......@@ -2267,7 +2268,8 @@ is specified, returning t if it is specified."
(and (search-forward "Local Variables:" nil t)
(or mode-only
(hack-local-variables-confirm
"Set local variables as specified at end of %s? "))))
"Set local variables as specified at end of %s? "
enable-local-variables))))
(skip-chars-forward " \t")
(let ((enable-local-eval enable-local-eval)
;; suffix is what comes after "local variables:" in its line.
......@@ -2489,7 +2491,8 @@ is considered risky."
;; Permit eval if not root and user says ok.
(and (not (zerop (user-uid)))
(hack-local-variables-confirm
"Process `eval' or hook local variables in %s? ")))
"Process `eval' or hook local variables in %s? "
enable-local-eval)))
(if (eq var 'eval)
(save-excursion (eval val))
(make-local-variable var)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment