aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-10-07 00:54:41 -0700
committerGlenn Morris2012-10-07 00:54:41 -0700
commit31bcb42062a9c80f9b7b6116a73353f37aac07f7 (patch)
treee60a4a3bc8aadcc41e6ff64e9f60b790faf88b24
parent99a1e701100ef02907d2ab64a7f05024bc2983be (diff)
downloademacs-31bcb42062a9c80f9b7b6116a73353f37aac07f7.tar.gz
emacs-31bcb42062a9c80f9b7b6116a73353f37aac07f7.zip
Un-mung previous erc-log change (error due to committer, not author)
-rw-r--r--lisp/erc/erc-log.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index aa6b332eb90..b3f3f5865a1 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -114,12 +114,12 @@ 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 "#channel!nick <at> server:port.txt" 117 :type '(choice (const :tag "#channel!nick@server:port.txt"
118 erc-generate-log-file-name-long) 118 erc-generate-log-file-name-long)
119 (const :tag "#channel!nick <at> network.txt" 119 (const :tag "#channel!nick@network.txt"
120 erc-generate-log-file-name-network) 120 erc-generate-log-file-name-network)
121 (const :tag "#channel.txt" erc-generate-log-file-name-short) 121 (const :tag "#channel.txt" erc-generate-log-file-name-short)
122 (const :tag "#channel <at> date.txt" 122 (const :tag "#channel@date.txt"
123 erc-generate-log-file-name-with-date) 123 erc-generate-log-file-name-with-date)
124 (function :tag "Other function"))) 124 (function :tag "Other function")))
125 125