aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-02-29 04:08:10 +0000
committerGlenn Morris2008-02-29 04:08:10 +0000
commitd805d7545f3aaefa0120fb007723589bb340f845 (patch)
treec5f62e4fd1b8ed58ddc3b40210818604ea418da1
parent2220be5b739d3270410a358d0bb38140f764c17a (diff)
downloademacs-d805d7545f3aaefa0120fb007723589bb340f845.tar.gz
emacs-d805d7545f3aaefa0120fb007723589bb340f845.zip
(allout-topic-encryption-bullet)
(allout-passphrase-verifier-handling, allout-passphrase-hint-handling) (allout-encrypt-unencrypted-on-saves): Change defcustom :version from 22.0 to 22.1.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/allout.el10
2 files changed, 12 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb80e96e331..df98bb937e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12008-02-29 Glenn Morris <rgm@gnu.org>
2
3 * allout.el (allout-topic-encryption-bullet)
4 (allout-passphrase-verifier-handling, allout-passphrase-hint-handling)
5 (allout-encrypt-unencrypted-on-saves): Change defcustom :version
6 from 22.0 to 22.1.
7
12008-02-29 Juanma Barranquero <lekktu@gmail.com> 82008-02-29 Juanma Barranquero <lekktu@gmail.com>
2 9
3 * desktop.el (desktop-save): Save the buffer name if the 10 * desktop.el (desktop-save): Save the buffer name if the
diff --git a/lisp/allout.el b/lisp/allout.el
index 075a41bdba1..5b1d38bb4b1 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -584,7 +584,7 @@ formatted copy."
584(defcustom allout-topic-encryption-bullet "~" 584(defcustom allout-topic-encryption-bullet "~"
585 "*Bullet signifying encryption of the entry's body." 585 "*Bullet signifying encryption of the entry's body."
586 :type '(choice (const nil) string) 586 :type '(choice (const nil) string)
587 :version "22.0" 587 :version "22.1"
588 :group 'allout-encryption) 588 :group 'allout-encryption)
589;;;_ = allout-passphrase-verifier-handling 589;;;_ = allout-passphrase-verifier-handling
590(defcustom allout-passphrase-verifier-handling t 590(defcustom allout-passphrase-verifier-handling t
@@ -593,7 +593,7 @@ formatted copy."
593See the docstring for the `allout-enable-file-variable-adjustment' 593See the docstring for the `allout-enable-file-variable-adjustment'
594variable for details about allout ajustment of file variables." 594variable for details about allout ajustment of file variables."
595 :type 'boolean 595 :type 'boolean
596 :version "22.0" 596 :version "22.1"
597 :group 'allout-encryption) 597 :group 'allout-encryption)
598(make-variable-buffer-local 'allout-passphrase-verifier-handling) 598(make-variable-buffer-local 'allout-passphrase-verifier-handling)
599;;;_ = allout-passphrase-hint-handling 599;;;_ = allout-passphrase-hint-handling
@@ -609,7 +609,7 @@ variable for details about allout ajustment of file variables."
609 :type '(choice (const always) 609 :type '(choice (const always)
610 (const needed) 610 (const needed)
611 (const disabled)) 611 (const disabled))
612 :version "22.0" 612 :version "22.1"
613 :group 'allout-encryption) 613 :group 'allout-encryption)
614(make-variable-buffer-local 'allout-passphrase-hint-handling) 614(make-variable-buffer-local 'allout-passphrase-hint-handling)
615;;;_ = allout-encrypt-unencrypted-on-saves 615;;;_ = allout-encrypt-unencrypted-on-saves
@@ -642,7 +642,7 @@ disable auto-saves for that file."
642 :type '(choice (const :tag "Yes" t) 642 :type '(choice (const :tag "Yes" t)
643 (const :tag "All except current topic" except-current) 643 (const :tag "All except current topic" except-current)
644 (const :tag "No" nil)) 644 (const :tag "No" nil))
645 :version "22.0" 645 :version "22.1"
646 :group 'allout-encryption) 646 :group 'allout-encryption)
647(make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves) 647(make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
648 648
@@ -1641,7 +1641,7 @@ the following two lines in your Emacs init file:
1641 ;; the _transient_ opening of invisible text during isearch -- is keyed to 1641 ;; the _transient_ opening of invisible text during isearch -- is keyed to
1642 ;; presence of the isearch-open-invisible property -- even though this 1642 ;; presence of the isearch-open-invisible property -- even though this
1643 ;; property controls the isearch _arrival_ behavior. This is the case at 1643 ;; property controls the isearch _arrival_ behavior. This is the case at
1644 ;; least in emacs 21, 22.0, and xemacs 21.4. 1644 ;; least in emacs 21, 22.1, and xemacs 21.4.
1645 (put 'allout-exposure-category 'isearch-open-invisible 1645 (put 'allout-exposure-category 'isearch-open-invisible
1646 'allout-isearch-end-handler) 1646 'allout-isearch-end-handler)
1647 (if (featurep 'xemacs) 1647 (if (featurep 'xemacs)