# HG changeset patch # User Glenn Morris # Date 1251256113 0 # Node ID def1fd7623f7504cb921e8bc50fcbedb965f5de1 # Parent c220a29e75fde99c2880c819991d7decc282f424 (enable-local-variables, enable-local-eval) (safe-local-variable-values, safe-local-eval-forms): Mark as risky in the defcustoms. (auto-mode-alist, ignored-local-variables) (save-some-buffers-action-alist): Move risky declarations to the definitions. (dabbrev-case-fold-search, dabbrev-case-replace, display-time-string) (font-lock-defaults, format-alist, imenu--index-alist) (imenu-generic-expression, input-method-alist, minor-mode-alist) (mode-line-buffer-identification, mode-line-client, mode-line-modes) (mode-line-modified, mode-line-mule-info, mode-line-position) (mode-line-process, mode-line-remote, outline-level) (parse-time-rules, rmail-output-file-alist) (special-display-buffer-names, vc-mode): Move risky declarations to the relevant files. diff -r c220a29e75fd -r def1fd7623f7 lisp/ChangeLog --- a/lisp/ChangeLog Wed Aug 26 03:07:25 2009 +0000 +++ b/lisp/ChangeLog Wed Aug 26 03:08:33 2009 +0000 @@ -3,6 +3,38 @@ * bindings.el (standard-mode-line-format): Reposition dashes in which-func entry. (Bug#4217) + * files.el (enable-local-variables, enable-local-eval) + (safe-local-variable-values, safe-local-eval-forms): Mark as risky in + the defcustoms. + (auto-mode-alist, ignored-local-variables) + (save-some-buffers-action-alist): Move risky declarations to the + definitions. + (dabbrev-case-fold-search, dabbrev-case-replace, display-time-string) + (font-lock-defaults, format-alist, imenu--index-alist) + (imenu-generic-expression, input-method-alist, minor-mode-alist) + (mode-line-buffer-identification, mode-line-client, mode-line-modes) + (mode-line-modified, mode-line-mule-info, mode-line-position) + (mode-line-process, mode-line-remote, outline-level) + (parse-time-rules, rmail-output-file-alist) + (special-display-buffer-names, vc-mode): + Move risky declarations to the relevant files. + * bindings.el (mode-line-client, mode-line-mule-info, mode-line-process) + (mode-line-modified, mode-line-remote, mode-line-position) + (mode-line-modes, mode-line-buffer-identification, minor-mode-alist) + * font-core.el (font-lock-defaults): + * format.el (format-alist): + * vc-hooks.el (vc-mode): + * window.el (special-display-buffer-names): + * international/mule-cmds.el (input-method-alist): + Define riskiness here (dumped file) rather than in files.el. + * dabbrev.el (dabbrev-case-fold-search, dabbrev-case-replace): + * imenu.el (imenu-generic-expression, imenu--index-alist): + * outline.el (outline-level): + * time.el (display-time-string): + * calendar/parse-time.el (parse-time-rules): + * mail/rmailout.el (rmail-output-file-alist): + Autoload riskiness here, rather than placing in files.el. + 2009-08-26 Andreas Schwab * emacs-lisp/bytecomp.el (byte-compile-lapcode): Signal overflow. diff -r c220a29e75fd -r def1fd7623f7 lisp/files.el --- a/lisp/files.el Wed Aug 26 03:07:25 2009 +0000 +++ b/lisp/files.el Wed Aug 26 03:08:33 2009 +0000 @@ -493,6 +493,7 @@ The command \\[normal-mode], when used interactively, always obeys file local variable specifications and the -*- line, and ignores this variable." + :risky t :type '(choice (const :tag "Query Unsafe" t) (const :tag "Safe Only" :safe) (const :tag "Do all" :all) @@ -514,6 +515,7 @@ The value can be t, nil or something else. A value of t means obey `eval' variables. A value of nil means ignore them; anything else means query." + :risky t :type '(choice (const :tag "Obey" t) (const :tag "Ignore" nil) (other :tag "Query" other)) @@ -2306,6 +2308,7 @@ See also `interpreter-mode-alist', which detects executable script modes based on the interpreters they specify to run, and `magic-mode-alist', which determines modes based on file contents.") +(put 'auto-mode-alist 'risky-local-variable t) (defun conf-mode-maybe () "Select Conf mode or XML mode according to start of file." @@ -2641,6 +2644,7 @@ '(ignored-local-variables safe-local-variable-values file-local-variables-alist dir-local-variables-alist) "Variables to be ignored in a file's local variable spec.") +(put 'ignored-local-variables 'risky-local-variable t) (defvar hack-local-variables-hook nil "Normal hook run after processing a file's local variables specs. @@ -2651,6 +2655,7 @@ "List variable-value pairs that are considered safe. Each element is a cons cell (VAR . VAL), where VAR is a variable symbol and VAL is a value that is considered safe." + :risky t :group 'find-file :type 'alist) @@ -2659,6 +2664,7 @@ Add expressions to this list if you want Emacs to evaluate them, when they appear in an `eval' local variable specification, without first asking you for confirmation." + :risky t :group 'find-file :version "22.2" :type '(repeat sexp)) @@ -2666,63 +2672,34 @@ ;; Risky local variables: (mapc (lambda (var) (put var 'risky-local-variable t)) '(after-load-alist - auto-mode-alist buffer-auto-save-file-name buffer-file-name buffer-file-truename buffer-undo-list - dabbrev-case-fold-search - dabbrev-case-replace debugger default-text-properties - display-time-string - enable-local-eval - enable-local-variables eval exec-directory exec-path file-name-handler-alist - font-lock-defaults - format-alist frame-title-format global-mode-string header-line-format icon-title-format - ignored-local-variables - imenu--index-alist - imenu-generic-expression inhibit-quit - input-method-alist load-path max-lisp-eval-depth max-specpdl-size - minor-mode-alist minor-mode-map-alist minor-mode-overriding-map-alist - mode-line-buffer-identification mode-line-format - mode-line-client - mode-line-modes - mode-line-modified - mode-line-mule-info - mode-line-position - mode-line-process - mode-line-remote mode-name - outline-level overriding-local-map overriding-terminal-local-map - parse-time-rules process-environment - rmail-output-file-alist - safe-local-variable-values - safe-local-eval-forms - save-some-buffers-action-alist - special-display-buffer-names standard-input standard-output - unread-command-events - vc-mode)) + unread-command-events)) ;; Safe local variables: ;; @@ -4399,6 +4376,7 @@ nil) "view changes in this buffer")) "ACTION-ALIST argument used in call to `map-y-or-n-p'.") +(put 'save-some-buffers-action-alist 'risky-local-variable t) (defvar buffer-save-without-query nil "Non-nil means `save-some-buffers' should save this buffer without asking.")