aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-11-30 09:09:55 -0800
committerGlenn Morris2012-11-30 09:09:55 -0800
commitfb3bf6ced41eea1431954e97137f52850a3b395c (patch)
tree5db173d53527941cf0d8a99bb183039442b06dbf
parentf43ce1c19768f995566cc8e44512633fead20e1d (diff)
downloademacs-fb3bf6ced41eea1431954e97137f52850a3b395c.tar.gz
emacs-fb3bf6ced41eea1431954e97137f52850a3b395c.zip
Defcustom :version fixes
* lisp/icomplete.el (icomplete-separator): Fix :version. * lisp/erc/erc.el (erc-accidental-paste-threshold-seconds): Add :version.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc.el1
-rw-r--r--lisp/icomplete.el2
4 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f908129afa..69492f03682 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-11-30 Glenn Morris <rgm@gnu.org>
2
3 * icomplete.el (icomplete-separator): Fix :version.
4
12012-11-30 Chong Yidong <cyd@gnu.org> 52012-11-30 Chong Yidong <cyd@gnu.org>
2 6
3 * shell.el (shell): For C-u M-x shell, use an inactive shell 7 * shell.el (shell): For C-u M-x shell, use an inactive shell
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index eeb31f99037..847b995997c 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12012-11-30 Glenn Morris <rgm@gnu.org>
2
3 * erc.el (erc-accidental-paste-threshold-seconds): Add :version.
4
12012-11-30 Eric Hanchrow <eric.hanchrow@gmail.com> 52012-11-30 Eric Hanchrow <eric.hanchrow@gmail.com>
2 6
3 * erc.el (erc-last-input-time): New variable. 7 * erc.el (erc-last-input-time): New variable.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index e03a0c5dc43..bead7759e13 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5230,6 +5230,7 @@ IRC server.
5230If the value is nil, `erc-send-current-line' always considers any 5230If the value is nil, `erc-send-current-line' always considers any
5231submitted line to be intentional." 5231submitted line to be intentional."
5232 :group 'erc 5232 :group 'erc
5233 :version "24.4"
5233 :type '(choice number (other :tag "disabled" nil))) 5234 :type '(choice number (other :tag "disabled" nil)))
5234 5235
5235(defun erc-send-current-line () 5236(defun erc-send-current-line ()
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 768692281f8..08d8c28816f 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -74,7 +74,7 @@
74(defcustom icomplete-separator " | " 74(defcustom icomplete-separator " | "
75 "String used by icomplete to separate alternatives in the minibuffer." 75 "String used by icomplete to separate alternatives in the minibuffer."
76 :type 'string 76 :type 'string
77 :version "24.3") 77 :version "24.4")
78 78
79;;;_* User Customization variables 79;;;_* User Customization variables
80(defcustom icomplete-prospects-height 80(defcustom icomplete-prospects-height