Mercurial > emacs
changeset 70590:63b772bfba93
Move `safe-local-variable' declarations to the respective files.
| author | Reiner Steib <Reiner.Steib@gmx.de> |
|---|---|
| date | Thu, 11 May 2006 15:01:41 +0000 |
| parents | d09c5cf66b5c |
| children | 51662caefaba |
| files | lisp/ChangeLog lisp/emacs-lisp/bytecomp.el lisp/files.el lisp/newcomment.el lisp/outline.el lisp/progmodes/cc-compat.el lisp/progmodes/cc-vars.el lisp/progmodes/compile.el lisp/simple.el |
| diffstat | 9 files changed, 24 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu May 11 11:10:45 2006 +0000 +++ b/lisp/ChangeLog Thu May 11 15:01:41 2006 +0000 @@ -1,5 +1,10 @@ 2006-05-11 Reiner Steib <Reiner.Steib@gmx.de> + * files.el, newcomment.el, outline.el, simple.el, + emacs-lisp/bytecomp.el, progmodes/cc-compat.el, + progmodes/cc-vars.el, progmodes/compile.el: Move + `safe-local-variable' declarations to the respective files. + * help-fns.el (describe-variable): Don't print safe-var if it is byte-code. Improve wording as suggested by Luc Teirlinck <teirllm@auburn.edu>.
--- a/lisp/emacs-lisp/bytecomp.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Thu May 11 15:01:41 2006 +0000 @@ -293,6 +293,7 @@ When this option is true, if you load the compiled file and then move it, the functions you loaded will not be able to run.") +;;;###autoload(put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (defcustom byte-compile-dynamic-docstrings t "*If non-nil, compile doc strings for lazy access. @@ -311,6 +312,7 @@ This option is enabled by default because it reduces Emacs memory usage." :group 'bytecomp :type 'boolean) +;;;###autoload(put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp) (defcustom byte-optimize-log nil "*If true, the byte-compiler will log its optimizations into *Compile-Log*. @@ -355,6 +357,7 @@ (const callargs) (const redefine) (const obsolete) (const noruntime) (const cl-functions) (const interactive-only)))) +;;;###autoload(put 'byte-compile-warnings 'safe-local-variable 'booleanp) (defvar byte-compile-interactive-only-functions '(beginning-of-buffer end-of-buffer replace-string replace-regexp @@ -1589,6 +1592,7 @@ This is normally set in local file variables at the end of the elisp file: ;; Local Variables:\n;; no-byte-compile: t\n;; End: ") +;;;###autoload(put 'no-byte-compile 'safe-local-variable 'booleanp) ;;;###autoload (defun byte-compile-file (filename &optional load)
--- a/lisp/files.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/files.el Thu May 11 15:01:41 2006 +0000 @@ -162,6 +162,7 @@ both at the file level and at the levels of the containing directories." :type 'boolean :group 'find-file) +(put 'find-file-visit-truename 'safe-local-variable 'boolean) (defcustom revert-without-query nil "*Specify which files should be reverted without query. @@ -249,6 +250,7 @@ (other :tag "Always" t)) :group 'backup :group 'vc) +(put 'version-control 'safe-local-variable 'symbolp) (defcustom dired-kept-versions 2 "*When cleaning directory, number of versions to keep." @@ -268,12 +270,14 @@ "*Number of oldest versions to keep when a new numbered backup is made." :type 'integer :group 'backup) +(put 'kept-old-versions 'safe-local-variable 'integerp) (defcustom kept-new-versions 2 "*Number of newest versions to keep when a new numbered backup is made. Includes the new backup. Must be > 0" :type 'integer :group 'backup) +(put 'kept-new-versions 'safe-local-variable 'integerp) (defcustom require-final-newline nil "*Whether to add a newline automatically at the end of the file. @@ -2351,27 +2355,12 @@ ;; FIXME: Some variables should be moved according to the rules above. (mapc (lambda (pair) (put (car pair) 'safe-local-variable (cdr pair))) - '((byte-compile-dynamic . booleanp) - (byte-compile-dynamic-docstrings . booleanp) - (byte-compile-warnings . booleanp) - (c-basic-offset . integerp) - (c-file-style . stringp) - (c-indent-level . integerp) - (comment-column . integerp) - (compile-command . string-or-null-p) - (find-file-visit-truename . booleanp) - (fill-column . integerp) - (fill-prefix . string-or-null-p) + '((fill-column . integerp) ;; C source code (indent-tabs-mode . booleanp) ;; C source code - (kept-old-versions . integerp) - (kept-new-versions . integerp) - (left-margin . integerp) - (no-byte-compile . booleanp) + (left-margin . integerp) ;; C source code (no-update-autoloads . booleanp) - (outline-regexp . string-or-null-p) (tab-width . integerp) ;; C source code - (truncate-lines . booleanp) ;; C source code - (version-control . symbolp))) + (truncate-lines . booleanp));; C source code (put 'c-set-style 'safe-local-eval-function t)
--- a/lisp/newcomment.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/newcomment.el Thu May 11 15:01:41 2006 +0000 @@ -104,6 +104,7 @@ :type 'integer :group 'comment) (make-variable-buffer-local 'comment-column) +;;;###autoload(put 'comment-column 'safe-local-variable 'integerp) ;;;###autoload (defvar comment-start nil
--- a/lisp/outline.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/outline.el Thu May 11 15:01:41 2006 +0000 @@ -54,6 +54,7 @@ in the file it applies to. See also `outline-heading-end-regexp'." :type '(choice regexp (const nil)) :group 'outlines) +;;;###autoload(put 'outline-regexp 'safe-local-variable 'string-or-null-p) (defcustom outline-heading-end-regexp "\n" "Regular expression to match the end of a heading line.
--- a/lisp/progmodes/cc-compat.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/progmodes/cc-compat.el Thu May 11 15:01:41 2006 +0000 @@ -62,6 +62,8 @@ ;; In case c-mode.el isn't loaded (defvar c-indent-level 2 "*Indentation of C statements with respect to containing block.") +;;;###autoload(put 'c-indent-level 'safe-local-variable 'integerp) + (defvar c-brace-imaginary-offset 0 "*Imagined indentation of a C open brace that actually follows a statement.") (defvar c-brace-offset 0
--- a/lisp/progmodes/cc-vars.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/progmodes/cc-vars.el Thu May 11 15:01:41 2006 +0000 @@ -248,6 +248,7 @@ nil." :type 'integer :group 'c) +;;;###autoload(put 'c-basic-offset 'safe-local-variable 'integerp) (defcustom c-tab-always-indent t "*Controls the operation of the TAB key. @@ -1542,6 +1543,7 @@ Note that file style settings are applied before file offset settings as designated in the variable `c-file-offsets'.") (make-variable-buffer-local 'c-file-style) +;;;###autoload(put 'c-file-style 'safe-local-variable 'string-or-null-p) (defvar c-file-offsets nil "Variable interface for setting offsets via File Local Variables.
--- a/lisp/progmodes/compile.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/progmodes/compile.el Thu May 11 15:01:41 2006 +0000 @@ -453,6 +453,7 @@ (file-name-sans-extension buffer-file-name))))))" :type 'string :group 'compilation) +;;;###autoload(put 'compile-command 'safe-local-variable 'stringp) ;;;###autoload (defcustom compilation-disable-input nil
--- a/lisp/simple.el Thu May 11 11:10:45 2006 +0000 +++ b/lisp/simple.el Thu May 11 15:01:41 2006 +0000 @@ -4058,6 +4058,7 @@ string) :group 'fill) (make-variable-buffer-local 'fill-prefix) +;;;###autoload(put 'fill-prefix 'safe-local-variable 'string-or-null-p) (defcustom auto-fill-inhibit-regexp nil "*Regexp to match lines which should not be auto-filled."