aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2012-10-06 19:05:04 -0700
committerGlenn Morris2012-10-06 19:05:04 -0700
commitb68f89c4e3bc88e21f70da947875caec023aa2cb (patch)
tree0714d26786fbf5b9bed56522fb3cb69373323c8f
parent2255788d775663c13f57fc0617b6d27398ae769d (diff)
downloademacs-b68f89c4e3bc88e21f70da947875caec023aa2cb.tar.gz
emacs-b68f89c4e3bc88e21f70da947875caec023aa2cb.zip
* lisp/erc/erc-log.el (erc-generate-log-file-name-function): Clarify tags
Fixes: debbugs:11186
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-log.el10
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 7fad769bdc6..37bc2922d22 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
12012-10-07 Deniz Dogan <deniz@dogan.se>
2
3 * erc-log.el (erc-generate-log-file-name-function):
4 Clarify tags for various choices. (Bug#11186)
5
12012-10-07 Glenn Morris <rgm@gnu.org> 62012-10-07 Glenn Morris <rgm@gnu.org>
2 7
3 * erc-button.el (erc-button-alist): Remove "finger". (Bug#4443) 8 * erc-button.el (erc-button-alist): Remove "finger". (Bug#4443)
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index 9e6c587bd12..aa6b332eb90 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -114,11 +114,13 @@ If you want to write logs into different directories, make a
114custom function which returns the directory part and set 114custom function which returns the directory part and set
115`erc-log-channels-directory' to its name." 115`erc-log-channels-directory' to its name."
116 :group 'erc-log 116 :group 'erc-log
117 :type '(choice (const :tag "Long style" erc-generate-log-file-name-long) 117 :type '(choice (const :tag "#channel!nick <at> server:port.txt"
118 (const :tag "Long, but with network name rather than server" 118 erc-generate-log-file-name-long)
119 (const :tag "#channel!nick <at> network.txt"
119 erc-generate-log-file-name-network) 120 erc-generate-log-file-name-network)
120 (const :tag "Short" erc-generate-log-file-name-short) 121 (const :tag "#channel.txt" erc-generate-log-file-name-short)
121 (const :tag "With date" erc-generate-log-file-name-with-date) 122 (const :tag "#channel <at> date.txt"
123 erc-generate-log-file-name-with-date)
122 (function :tag "Other function"))) 124 (function :tag "Other function")))
123 125
124(defcustom erc-truncate-buffer-on-save nil 126(defcustom erc-truncate-buffer-on-save nil