diff options
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc-log.el | 10 |
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 @@ +2012-10-07 Deniz Dogan <deniz@dogan.se> + + * erc-log.el (erc-generate-log-file-name-function): + Clarify tags for various choices. (Bug#11186) + 2012-10-07 Glenn Morris <rgm@gnu.org> * 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 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 |