[Emacs-diffs] /srv/bzr/emacs/trunk r110413: Un-mung previous erc-log change (error due to committer, not author)

[Glenn Morris]

------------------------------------------------------------
revno: 110413
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-07 00:54:41 -0700
message:
  Un-mung previous erc-log change (error due to committer, not author)
modified:
  lisp/erc/erc-log.el

=== modified file 'lisp/erc/erc-log.el'
--- a/lisp/erc/erc-log.el       2012-10-07 02:05:04 +0000
+++ b/lisp/erc/erc-log.el       2012-10-07 07:54:41 +0000
@@ -114,12 +114,12 @@
 custom function which returns the directory part and set
 `erc-log-channels-directory' to its name."
   :group 'erc-log
-  :type '(choice (const :tag "#channel!nick <at> server:port.txt"
+  :type '(choice (const :tag "address@hidden:port.txt"
                        erc-generate-log-file-name-long)
-                (const :tag "#channel!nick <at> network.txt"
+                (const :tag "address@hidden"
                        erc-generate-log-file-name-network)
                 (const :tag "#channel.txt" erc-generate-log-file-name-short)
-                (const :tag "#channel <at> date.txt"
+                (const :tag "address@hidden"
                        erc-generate-log-file-name-with-date)
                 (function :tag "Other function")))