diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2006-05-03 11:56:53 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2006-05-03 11:56:53 +0000 |
commit | c044516d384ff70e820686d4e995dcc23ee22e6f (patch) | |
tree | 4a9b52cf3e7da73040903b719dfca8113a765884 /lisp/help-fns.el | |
parent | b33c71f58623306001d4d4fe4f7354d8c360edaa (diff) | |
parent | 9d6bb9e0af2671a4deca1509f4a2d5655400f67a (diff) | |
download | emacs-c044516d384ff70e820686d4e995dcc23ee22e6f.tar.gz |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-252
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-253
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-254
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-255
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-256
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-257
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-258
Clean up lisp/gnus/ChangeLog a bit
* emacs@sv.gnu.org/emacs--devo--0--patch-259
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-260
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-261
lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
* emacs@sv.gnu.org/emacs--devo--0--patch-262
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-96
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-97
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-98
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-554
Diffstat (limited to 'lisp/help-fns.el')
-rw-r--r-- | lisp/help-fns.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 0a78ed8d68b..12a4b4bdbf2 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -638,6 +638,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) @@ -649,6 +650,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. |