(allout-layout, allout-passphrase-verifier-string)

(allout-passphrase-hint-string): Tighten up a bit the safety predicate.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd46d8b60f495d0109b0665e929de4a87a37295e..768811285859bed588b1abdfe6e1c14c1890bd11 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-04-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * allout.el (allout-layout, allout-passphrase-verifier-string)
+       (allout-passphrase-hint-string): Tighten up a bit the safety predicate.
+
        * textmodes/reftex-vars.el (reftex-vref-is-default)
        (reftex-fref-is-default, reftex-guess-label-type):
        Tighten up a bit the safety predicate.

diff --git a/lisp/allout.el b/lisp/allout.el
index 66c4b8681db155426868e0542fa8bf0531cadd78..cf7b922eea6b9133c1cf52d925afcee1bfdf5fe6 100644 (file)
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -667,7 +667,7 @@ the layout used for the allout.el source file.)
 case the value of `allout-default-layout' is used.")
 (make-variable-buffer-local 'allout-layout)
 ;;;###autoload
-(put 'allout-layout 'safe-local-variable t)
+(put 'allout-layout 'safe-local-variable (lambda (x) (or (listp x) (symbolp x))))
 
 ;;;_  : Topic header format
 ;;;_   = allout-regexp
@@ -1053,7 +1053,7 @@ The verifier string is retained as an Emacs file variable, as well as in
 the emacs buffer state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-verifier-string)
-(put 'allout-passphrase-verifier-string 'safe-local-variable t)
+(put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp)
 ;;;_   = allout-passphrase-hint-string
 (defvar allout-passphrase-hint-string ""
   "Variable used to retain reminder string for file's encryption passphrase.
@@ -1065,7 +1065,7 @@ The hint is retained as an Emacs file variable, as well as in the emacs buffer
 state, if file variable adjustments are enabled.  See
 `allout-enable-file-variable-adjustment' for details about that.")
 (make-variable-buffer-local 'allout-passphrase-hint-string)
-(put 'allout-passphrase-hint-string 'safe-local-variable t)
+(put 'allout-passphrase-hint-string 'safe-local-variable 'stringp)
 (setq-default allout-passphrase-hint-string "")
 ;;;_   = allout-after-save-decrypt
 (defvar allout-after-save-decrypt nil