aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Danjou2011-03-03 21:04:51 -0800
committerGlenn Morris2011-03-03 21:04:51 -0800
commit35fee6ce58661a1d32e995f1dac5a49d8d824fa1 (patch)
tree15016cf15c237ca534b0fd2be35a18b09080217c
parentfc0e90924a0621bcf7fd3f1b1251a1b2b5d0a470 (diff)
downloademacs-35fee6ce58661a1d32e995f1dac5a49d8d824fa1.tar.gz
emacs-35fee6ce58661a1d32e995f1dac5a49d8d824fa1.zip
* lisp/erc/erc-track.el (erc-track-visibility): Fix :type. (Bug#6369)
-rw-r--r--lisp/erc/ChangeLog4
-rw-r--r--lisp/erc/erc-track.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 2996fee9bcb..e05828dfeea 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
12011-03-04 Julien Danjou <julien@danjou.info>
2
3 * erc-track.el (erc-track-visibility): Fix :type. (Bug#6369)
4
12011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> 52011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * erc-list.el (erc-list-menu-mode-map): Move initialization 7 * erc-list.el (erc-list-menu-mode-map): Move initialization
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index a89244f695d..28c1ced91c6 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -84,8 +84,8 @@ Activity means that there was no user input in the last 10 seconds."
84 :type '(choice (const :tag "All frames" t) 84 :type '(choice (const :tag "All frames" t)
85 (const :tag "All visible frames" visible) 85 (const :tag "All visible frames" visible)
86 (const :tag "Only the selected frame" nil) 86 (const :tag "Only the selected frame" nil)
87 (const :tag "Only the selected frame if it was active" 87 (const :tag "Only the selected frame if it is visible"
88 active))) 88 selected-visible)))
89 89
90(defcustom erc-track-exclude nil 90(defcustom erc-track-exclude nil
91 "A list targets (channel names or query targets) which should not be tracked." 91 "A list targets (channel names or query targets) which should not be tracked."