[Emacs-diffs] /srv/bzr/emacs/trunk r110408: * lisp/erc/erc-log.el (erc-generate-log-file-name-function): Clarify tags

[Glenn Morris]

------------------------------------------------------------
revno: 110408
fixes bug: http://debbugs.gnu.org/11186
author: Deniz Dogan <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-06 19:05:04 -0700
message:
  * lisp/erc/erc-log.el (erc-generate-log-file-name-function): Clarify tags
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-log.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-10-07 01:45:03 +0000
+++ b/lisp/erc/ChangeLog        2012-10-07 02:05:04 +0000
@@ -1,3 +1,8 @@
+2012-10-07  Deniz Dogan  <address@hidden>
+
+       * erc-log.el (erc-generate-log-file-name-function):
+       Clarify tags for various choices.  (Bug#11186)
+
 2012-10-07  Glenn Morris  <address@hidden>
 
        * erc-button.el (erc-button-alist): Remove "finger".  (Bug#4443)

=== modified file 'lisp/erc/erc-log.el'
--- a/lisp/erc/erc-log.el       2012-10-06 01:04:53 +0000
+++ b/lisp/erc/erc-log.el       2012-10-07 02:05:04 +0000
@@ -114,11 +114,13 @@
 custom function which returns the directory part and set
 `erc-log-channels-directory' to its name."
   :group 'erc-log
-  :type '(choice (const :tag "Long style" erc-generate-log-file-name-long)
-                (const :tag "Long, but with network name rather than server"
+  :type '(choice (const :tag "#channel!nick <at> server:port.txt"
+                       erc-generate-log-file-name-long)
+                (const :tag "#channel!nick <at> network.txt"
                        erc-generate-log-file-name-network)
-                (const :tag "Short" erc-generate-log-file-name-short)
-                (const :tag "With date" erc-generate-log-file-name-with-date)
+                (const :tag "#channel.txt" erc-generate-log-file-name-short)
+                (const :tag "#channel <at> date.txt"
+                       erc-generate-log-file-name-with-date)
                 (function :tag "Other function")))
 
 (defcustom erc-truncate-buffer-on-save nil