Move `safe-local-variable' declarations to the respective files.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b7c47339ca9c82566094f85391789b884ccee0c..a957dd12fba4a899e90d9a90198e378c4da391e2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>.

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index da284e94548512ce29aba755cf26c49b78caaac0..01f9373af687f36154459b9d2ad881fb258f91d6 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -293,6 +293,7 @@ For example, add  -*-byte-compile-dynamic: t;-*- on the first line.
 
 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 @@ You can also set the variable globally.
 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 @@ Elements of the list may be be:
                      (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 @@ recompile every `.el' file that already has a `.elc' file."
 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)

diff --git a/lisp/files.el b/lisp/files.el
index 29cd3038500fd40ea78dd854fc09718f1558d0e0..ffd09c7bfbc4ec292150c100ca3bd23a8e51edbf 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -162,6 +162,7 @@ The truename of a file is found by chasing all links
 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 @@ nil means make them for files that have some already.
                 (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 @@ If nil, ask confirmation.  Any other value prevents any trimming."
   "*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 @@ asking you for confirmation."
 ;; 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)
 

diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index d5a2cea914afd534453cf613d36c97b8705b46cf..5dfa1eb89598df470e26df8fafbc7cf8000d528a 100644 (file)
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -104,6 +104,7 @@ not to go beyond `comment-fill-column'."
   :type 'integer
   :group 'comment)
 (make-variable-buffer-local 'comment-column)
+;;;###autoload(put 'comment-column 'safe-local-variable 'integerp)
 
 ;;;###autoload
 (defvar comment-start nil

diff --git a/lisp/outline.el b/lisp/outline.el
index 92542bae7e307e7c6c73600aaa28d57e7a894876..0cd6eaa718665a17d7e76adad3d809865bb11449 100644 (file)
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -54,6 +54,7 @@ The recommended way to set this is with a Local Variables: list
 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.

diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el
index 59cd523240252ada0df74313768af72390cf47c2..d08c9fc0162724007a3b4b989ecf91312bc8e47d 100644 (file)
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -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

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index ee187408701b666416300152045ac8f96092a979..64e38be62d05562b41e34eea11c8fa766864770d 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -248,6 +248,7 @@ Also used as the indentation step when `c-syntactic-indentation' is
 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 @@ will set the style of the file to this value automatically.
 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.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 2fa3ee0ff15567f5e6dcf1d1d7eff52025719fc6..527624bfc4e02bd0257747bbe72c8b6c26469621 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -453,6 +453,7 @@ You might also use mode hooks to specify it in certain modes, like this:
                        (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

diff --git a/lisp/simple.el b/lisp/simple.el
index 6d3fc8a54849f34026e9a24421236b6063bf3467..9285d124db4bc63cb1c766c5ca550d4ca98c3e4d 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4058,6 +4058,7 @@ If optional arg REALLY-WORD is non-nil, it finds just a word."
                 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."