aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-02-29 04:06:59 +0000
committerGlenn Morris2008-02-29 04:06:59 +0000
commit21e8bc996dcb20a54b40311ebdcf9646840a7cfe (patch)
treef3aea32e5e2c2ae79fc05c467056d454629dff40
parent330f707bedf7e7f3f8fdcd7012d0eca4febe2894 (diff)
downloademacs-21e8bc996dcb20a54b40311ebdcf9646840a7cfe.tar.gz
emacs-21e8bc996dcb20a54b40311ebdcf9646840a7cfe.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/ChangeLog5
-rw-r--r--lisp/allout.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e051e2d1b91..a8bc7f49de5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
12008-02-29 Glenn Morris <rgm@gnu.org> 12008-02-29 Glenn Morris <rgm@gnu.org>
2 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
3 * net/imap.el (imap-ping-server): 8 * net/imap.el (imap-ping-server):
4 * net/tls.el (tls-checktrust, tls-untrusted, tls-hostmismatch): 9 * net/tls.el (tls-checktrust, tls-untrusted, tls-hostmismatch):
5 Change defcustom :version from 23.0 to 23.1. 10 Change defcustom :version from 23.0 to 23.1.
diff --git a/lisp/allout.el b/lisp/allout.el
index a259723d5ba..9c90e702bbf 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -691,7 +691,7 @@ formatted copy."
691(defcustom allout-topic-encryption-bullet "~" 691(defcustom allout-topic-encryption-bullet "~"
692 "*Bullet signifying encryption of the entry's body." 692 "*Bullet signifying encryption of the entry's body."
693 :type '(choice (const nil) string) 693 :type '(choice (const nil) string)
694 :version "22.0" 694 :version "22.1"
695 :group 'allout-encryption) 695 :group 'allout-encryption)
696;;;_ = allout-passphrase-verifier-handling 696;;;_ = allout-passphrase-verifier-handling
697(defcustom allout-passphrase-verifier-handling t 697(defcustom allout-passphrase-verifier-handling t
@@ -700,7 +700,7 @@ formatted copy."
700See the docstring for the `allout-enable-file-variable-adjustment' 700See the docstring for the `allout-enable-file-variable-adjustment'
701variable for details about allout ajustment of file variables." 701variable for details about allout ajustment of file variables."
702 :type 'boolean 702 :type 'boolean
703 :version "22.0" 703 :version "22.1"
704 :group 'allout-encryption) 704 :group 'allout-encryption)
705(make-variable-buffer-local 'allout-passphrase-verifier-handling) 705(make-variable-buffer-local 'allout-passphrase-verifier-handling)
706;;;_ = allout-passphrase-hint-handling 706;;;_ = allout-passphrase-hint-handling
@@ -716,7 +716,7 @@ variable for details about allout ajustment of file variables."
716 :type '(choice (const always) 716 :type '(choice (const always)
717 (const needed) 717 (const needed)
718 (const disabled)) 718 (const disabled))
719 :version "22.0" 719 :version "22.1"
720 :group 'allout-encryption) 720 :group 'allout-encryption)
721(make-variable-buffer-local 'allout-passphrase-hint-handling) 721(make-variable-buffer-local 'allout-passphrase-hint-handling)
722;;;_ = allout-encrypt-unencrypted-on-saves 722;;;_ = allout-encrypt-unencrypted-on-saves
@@ -749,7 +749,7 @@ disable auto-saves for that file."
749 :type '(choice (const :tag "Yes" t) 749 :type '(choice (const :tag "Yes" t)
750 (const :tag "All except current topic" except-current) 750 (const :tag "All except current topic" except-current)
751 (const :tag "No" nil)) 751 (const :tag "No" nil))
752 :version "22.0" 752 :version "22.1"
753 :group 'allout-encryption) 753 :group 'allout-encryption)
754(make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves) 754(make-variable-buffer-local 'allout-encrypt-unencrypted-on-saves)
755 755
@@ -1664,7 +1664,7 @@ the following two lines in your Emacs init file:
1664 ;; the _transient_ opening of invisible text during isearch -- is keyed to 1664 ;; the _transient_ opening of invisible text during isearch -- is keyed to
1665 ;; presence of the isearch-open-invisible property -- even though this 1665 ;; presence of the isearch-open-invisible property -- even though this
1666 ;; property controls the isearch _arrival_ behavior. This is the case at 1666 ;; property controls the isearch _arrival_ behavior. This is the case at
1667 ;; least in emacs 21, 22.0, and xemacs 21.4. 1667 ;; least in emacs 21, 22.1, and xemacs 21.4.
1668 (put 'allout-exposure-category 'isearch-open-invisible 1668 (put 'allout-exposure-category 'isearch-open-invisible
1669 'allout-isearch-end-handler) 1669 'allout-isearch-end-handler)
1670 (if (featurep 'xemacs) 1670 (if (featurep 'xemacs)