* help-fns.el (describe-variable): Add info about safe local variables.

* custom.texi (Examining): Update C-h v output example.

4 files changed, 17 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d758347a5c8..55893760f36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * help-fns.el (describe-variable): Add info about safe local variables.
+
 2006-04-29  Richard Stallman  <rms@gnu.org>
 
         * net/tramp.el (tramp-file-name-handler-alist): Delete
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index d30fc02c409..2b75e7fd053 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -630,6 +630,7 @@ it is displayed along with the global value."
                              (indirect-variable variable)
                            (error variable)))
                    (obsolete (get variable 'byte-obsolete-variable))
+                   (safe-var (get variable 'safe-local-variable))
                    (doc (or (documentation-property variable 'variable-documentation)
                             (documentation-property alias 'variable-documentation))))
               (unless (eq alias variable)
@@ -641,6 +642,11 @@ it is displayed along with the global value."
                 (princ (if (stringp (car obsolete)) (car obsolete)
                          (format "use `%s' instead." (car obsolete))))
                 (terpri))
+              (when safe-var 
+                (princ "This variable is safe to use as a file local variable")
+                (princ (format " only if its value\nsatisfies the predicate `%s'.\n"
+                               safe-var))
+                (terpri))
               (princ "Documentation:\n")
               (princ (or doc "Not documented as a variable.")))
             ;; Make a link to customize if this variable can be customized.
diff --git a/man/ChangeLog b/man/ChangeLog
index 08db65e95e4..ff23fe67a18 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * custom.texi (Examining): Update C-h v output example.
+
 2006-04-29  Kim F. Storm  <storm@cua.dk>
 
         * building.texi (Grep Searching): Add lgrep and rgrep.
diff --git a/man/custom.texi b/man/custom.texi
index f133e890b0a..35c9222628c 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -822,6 +822,9 @@ fill-column's value is 70
 Local in buffer custom.texi; global value is 70
 Automatically becomes buffer-local when set in any fashion.
 
+This variable is safe to use as a file local variable only if its value
+satisfies the predicate `integerp'.
+
 Documentation:
 *Column beyond which automatic line-wrapping should happen.
 Interactively, you can set the buffer local value using C-x f.