* files.el: Move some `safe-local-variable' declarations to the

respective files.

* textmodes/ispell.el (ispell-check-comments)
(ispell-local-dictionary): Mark as safe.

* abbrev.el (abbrev-mode): Mark as safe.

* add-log.el (change-log-default-name): Mark as safe.

* textmodes/reftex-vars.el (reftex-vref-is-default)
(reftex-fref-is-default, reftex-level-indent)
(reftex-guess-label-type): Mark as safe.

* textmodes/fill.el (colon-double-space): Mark as safe.

* textmodes/paragraphs.el (paragraph-start, paragraph-separate)
(sentence-end-double-space, sentence-end-without-period)
(sentence-end-without-space, sentence-end, sentence-end-base)
(page-delimiter, paragraph-ignore-fill-prefix): Mark as safe.

8 files changed, 44 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a1810e8dc0..78a9090e802 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2006-04-06  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * files.el: Move some `safe-local-variable' declarations to the
+        respective files.
+
+        * textmodes/ispell.el (ispell-check-comments)
+        (ispell-local-dictionary): Mark as safe.
+
+        * abbrev.el (abbrev-mode): Mark as safe.
+
+        * add-log.el (change-log-default-name): Mark as safe.
+
+        * textmodes/reftex-vars.el (reftex-vref-is-default)
+        (reftex-fref-is-default, reftex-level-indent)
+        (reftex-guess-label-type): Mark as safe.
+
+        * textmodes/fill.el (colon-double-space): Mark as safe.
+
+        * textmodes/paragraphs.el (paragraph-start, paragraph-separate)
+        (sentence-end-double-space, sentence-end-without-period)
+        (sentence-end-without-space, sentence-end, sentence-end-base)
+        (page-delimiter, paragraph-ignore-fill-prefix): Mark as safe.
+
 2006-04-06  Kim F. Storm  <storm@cua.dk>
 
         * ido.el (ido-mode): Remove ido-ignore-unc-host-regexps from
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index bd0c6ffc094..d7bce2b313a 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -58,6 +58,7 @@ Interactively, use the command `abbrev-mode'
 to enable or disable Abbrev mode in the current buffer."
   :type 'boolean
   :group 'abbrev-mode)
+;;;###autoload(put 'abbrev-mode 'safe-local-variable t)
 
 
 (defvar edit-abbrevs-map
diff --git a/lisp/add-log.el b/lisp/add-log.el
index d504b57ae17..1afdc7dcb72 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -45,6 +45,8 @@
   :type '(choice (const :tag "default" nil)
                  string)
   :group 'change-log)
+(put 'change-log-default-name 'safe-local-variable
+     (lambda (a) (or (stringp a) (null a))))
 
 (defcustom change-log-mode-hook nil
   "Normal hook run by `change-log-mode'."
diff --git a/lisp/files.el b/lisp/files.el
index f68907a7d7b..7ab7d593e4c 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2344,21 +2344,13 @@ asking you for confirmation."
             (fill-column        .  integerp)
             (fill-prefix        . ,string-or-null)
             (indent-tabs-mode   .  t)
-            (ispell-check-comments . (lambda (a)
-                                       (memq a '(nil t exclusive))))
-            (ispell-local-dictionary . ,string-or-null)
             (kept-new-versions  .  integerp)
             (left-margin        .  t)
             (no-byte-compile    .  t)
             (no-update-autoloads . t)
             (outline-regexp     . ,string-or-null)
-            (page-delimiter     . ,string-or-null)
-            (paragraph-start    . ,string-or-null)
-            (paragraph-separate . ,string-or-null)
-            (sentence-end       . ,string-or-null)
-            (sentence-end-double-space . t)
-            (tab-width          .  integerp)
-            (truncate-lines     .  t)
+            (tab-width          .  integerp) ;; C source code
+            (truncate-lines     .  t) ;; C source code
             (version-control    .  t)))))
 
 (put 'c-set-style 'safe-local-eval-function t)
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index f472743ef16..312c73a380b 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -48,6 +48,7 @@ A value of nil means that any change in indentation starts a new paragraph."
   "*Non-nil means put two spaces after a colon when filling."
   :type 'boolean
   :group 'fill)
+;;;###autoload(put 'colon-double-space 'safe-local-variable t)
 
 (defvar fill-paragraph-function nil
   "Mode-specific function to fill a paragraph, or nil if there is none.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 64314c772b2..8a08f9dd078 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -267,6 +267,7 @@ Warning!  Not checking comments, when a comment start is embedded in strings,
 may produce undesired results."
   :type '(choice (const exclusive) (const :tag "off" nil) (const :tag "on" t))
   :group 'ispell)
+;;;###autoload(put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive))))
 
 (defcustom ispell-query-replace-choices nil
   "*Corrections made throughout region when non-nil.
@@ -461,6 +462,7 @@ is automatically set when defined in the file with either
   :type '(choice string
                  (const :tag "default" nil))
   :group 'ispell)
+;;;###autoload(put 'ispell-local-dictionary 'safe-local-variable (lambda (a) (or (stringp a) (null a))))
 
 (make-variable-buffer-local 'ispell-local-dictionary)
 
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 927fa644b9d..c62f337e456 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -98,6 +98,7 @@ If the variable `use-hard-newlines' is non-nil, then only lines following a
 hard newline are considered to match."
   :group 'paragraphs
   :type 'regexp)
+;;;###autoload(put 'paragraph-start 'safe-local-variable 'stringp)
 
 ;; paragraph-start requires a hard newline, but paragraph-separate does not:
 ;; It is assumed that paragraph-separate is distinctive enough to be believed
@@ -115,6 +116,7 @@ ensures that the paragraph functions will work equally within a region of
 text indented by a margin setting."
   :group 'paragraphs
   :type 'regexp)
+;;;###autoload(put 'paragraph-separate 'safe-local-variable 'stringp)
 
 (defcustom sentence-end-double-space t
   "*Non-nil means a single space does not end a sentence.
@@ -126,6 +128,7 @@ regexp describing the end of a sentence, when the value of the variable
 `sentence-end' is nil.  See Info node `(elisp)Standard Regexps'."
   :type 'boolean
   :group 'fill)
+;;;###autoload(put 'sentence-end-double-space 'safe-local-variable t)
 
 (defcustom sentence-end-without-period nil
   "*Non-nil means a sentence will end without a period.
@@ -137,6 +140,7 @@ regexp describing the end of a sentence, when the value of the variable
 `sentence-end' is nil.  See Info node `(elisp)Standard Regexps'."
   :type 'boolean
   :group 'fill)
+;;;###autoload(put 'sentence-end-without-period 'safe-local-variable t)
 
 (defcustom sentence-end-without-space
   "$B!#!%!)!*$A!##.#?#!$(0!$!%!)!*$(G!$!%!)!*(B"
@@ -147,6 +151,7 @@ regexp describing the end of a sentence, when the value of the variable
 `sentence-end' is nil.  See Info node `(elisp)Standard Regexps'."
   :group 'paragraphs
   :type 'string)
+;;;###autoload(put 'sentence-end-without-space 'safe-local-variable t)
 
 (defcustom sentence-end nil
   "*Regexp describing the end of a sentence.
@@ -158,12 +163,14 @@ function `sentence-end'.  You should always use this function
 to obtain the value of this variable."
   :group 'paragraphs
   :type '(choice regexp (const :tag "Use default value" nil)))
+;;;###autoload(put 'sentence-end 'safe-local-variable (lambda (a) (or (stringp a) (null a))))
 
 (defcustom sentence-end-base "[.?!][]\"'$B!I$,1r}(B)}]*"
   "*Regexp matching the basic end of a sentence, not including following space."
   :group 'paragraphs
   :type 'string
   :version "22.1")
+;;;###autoload(put 'sentence-end-base 'safe-local-variable 'stringp)
 
 (defun sentence-end ()
   "Return the regexp describing the end of a sentence.
@@ -191,12 +198,14 @@ in between.  See Info node `(elisp)Standard Regexps'."
   "*Regexp describing line-beginnings that separate pages."
   :group 'paragraphs
   :type 'regexp)
+;;;###autoload(put 'page-delimiter 'safe-local-variable t)
 
 (defcustom paragraph-ignore-fill-prefix nil
   "*Non-nil means the paragraph commands are not affected by `fill-prefix'.
 This is desirable in modes where blank lines are the paragraph delimiters."
   :group 'paragraphs
   :type 'boolean)
+;;;###autoload(put 'paragraph-ignore-fill-prefix 'safe-local-variable t)
 
 (defun forward-paragraph (&optional arg)
   "Move forward to end of paragraph.
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index e866b03626f..07b5d1ca178 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -948,6 +948,7 @@ Instead of nil or t, this may also be a string of type letters indicating
 the label types for which it should be true."
   :group  'reftex-referencing-labels
   :type `(choice :tag "\\vref is default macro" ,@reftex-tmp))
+;;;###autoload(put 'reftex-vref-is-default 'safe-local-variable t)
 
 (defcustom reftex-fref-is-default nil
   "*Non-nil means, the fancyref macro \\fref is used as default.
@@ -958,11 +959,13 @@ Instead of nil or t, this may also be a string of type letters indicating
 the label types for which it should be true."
   :group  'reftex-referencing-labels
   :type `(choice :tag "\\fref is default macro" ,@reftex-tmp))
+;;;###autoload(put 'reftex-fref-is-default 'safe-local-variable t)
 
 (defcustom reftex-level-indent 2
   "*Number of spaces to be used for indentation per section level."
   :group 'reftex-referencing-labels
   :type 'integer)
+;;;###autoload(put 'reftex-level-indent 'safe-local-variable 'integerp)
 
 (defcustom reftex-guess-label-type t
   "*Non-nil means, `reftex-reference' will try to guess the label type.
@@ -972,6 +975,7 @@ immediately offer the correct label menu - otherwise it will prompt you for
 a label type.  If you set this variable to nil, RefTeX will always prompt."
   :group 'reftex-referencing-labels
   :type 'boolean)
+;;;###autoload(put 'reftex-guess-label-type 'safe-local-variable t)
 
 (defcustom reftex-format-ref-function nil
   "Function which produces the string to insert as a reference.