# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1146345485 0
# Node ID fe86bf68143569d435a45644114051ef56e45b98
# Parent  f7ef1c0da4f9910567c83947688b04eea1eaf897
* help-fns.el (describe-variable): Add info about safe local variables.

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

diff -r f7ef1c0da4f9 -r fe86bf681435 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 29 20:15:48 2006 +0000
+++ b/lisp/ChangeLog	Sat Apr 29 21:18:05 2006 +0000
@@ -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 -r f7ef1c0da4f9 -r fe86bf681435 lisp/help-fns.el
--- a/lisp/help-fns.el	Sat Apr 29 20:15:48 2006 +0000
+++ b/lisp/help-fns.el	Sat Apr 29 21:18:05 2006 +0000
@@ -630,6 +630,7 @@
                              (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 @@
                 (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 -r f7ef1c0da4f9 -r fe86bf681435 man/ChangeLog
--- a/man/ChangeLog	Sat Apr 29 20:15:48 2006 +0000
+++ b/man/ChangeLog	Sat Apr 29 21:18:05 2006 +0000
@@ -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 -r f7ef1c0da4f9 -r fe86bf681435 man/custom.texi
--- a/man/custom.texi	Sat Apr 29 20:15:48 2006 +0000
+++ b/man/custom.texi	Sat Apr 29 21:18:05 2006 +0000
@@ -822,6 +822,9 @@
 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.