From: Glenn Morris Date: Sun, 7 Oct 2012 07:54:41 +0000 (-0700) Subject: Un-mung previous erc-log change (error due to committer, not author) X-Git-Tag: emacs-24.2.90~239^2~6 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31bcb42062a9c80f9b7b6116a73353f37aac07f7;p=emacs.git Un-mung previous erc-log change (error due to committer, not author) --- 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 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 server:port.txt" + :type '(choice (const :tag "#channel!nick@server:port.txt" erc-generate-log-file-name-long) - (const :tag "#channel!nick network.txt" + (const :tag "#channel!nick@network.txt" erc-generate-log-file-name-network) (const :tag "#channel.txt" erc-generate-log-file-name-short) - (const :tag "#channel date.txt" + (const :tag "#channel@date.txt" erc-generate-log-file-name-with-date) (function :tag "Other function")))