diff options
| author | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
|---|---|---|
| committer | Yuuki Harano <masm+github@masm11.me> | 2021-11-11 00:39:53 +0900 |
| commit | 4dd1f56f29fc598a8339a345c2f8945250600602 (patch) | |
| tree | af341efedffe027e533b1bcc0dbf270532e48285 /lisp/erc/erc-log.el | |
| parent | 4c49ec7f865bdad1629d2f125f71f4e506b258f2 (diff) | |
| parent | 810fa21d26453f898de9747ece7205dfe6de9d08 (diff) | |
| download | emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.gz emacs-4dd1f56f29fc598a8339a345c2f8945250600602.tar.bz2 emacs-4dd1f56f29fc598a8339a345c2f8945250600602.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/erc/erc-log.el')
| -rw-r--r-- | lisp/erc/erc-log.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el index ddd00afd73b..7c5c495f9e1 100644 --- a/lisp/erc/erc-log.el +++ b/lisp/erc/erc-log.el @@ -180,8 +180,7 @@ If you set this to nil, you may want to enable both :type 'boolean) (defcustom erc-log-write-after-insert nil - "If non-nil, write to log file when new text is added to a -logged ERC buffer. + "If non-nil, write to log file when new text is added to a logged ERC buffer. If you set this to nil, you may want to enable both `erc-save-buffer-on-part' and `erc-save-queries-on-quit'." @@ -195,8 +194,7 @@ This should ideally, be a \"catch-all\" coding system, like :type 'coding-system) (defcustom erc-log-filter-function nil - "If non-nil, pass text through the given function before writing it to -a log file. + "If non-nil, pass text to this function before writing it to a log file. The function should take one argument, which is the text to filter." :type '(choice (function "Function") @@ -361,7 +359,7 @@ function is a possible value for (concat (buffer-name buffer) ".txt")) (defun erc-generate-log-file-name-long (_buffer target nick server port) - "Generates a log-file name in the way ERC always did it. + "Generate a log-file name in the way ERC always did it. This results in a file name of the form #channel!nick@server:port.txt. This function is a possible value for `erc-generate-log-file-name-function'." (let ((file (concat @@ -375,7 +373,7 @@ This function is a possible value for `erc-generate-log-file-name-function'." (declare-function erc-network-name "erc-networks" ()) (defun erc-generate-log-file-name-network (buffer target nick server _port) - "Generates a log-file name using the network name rather than server name. + "Generate a log-file name using the network name rather than server name. This results in a file name of the form #channel!nick@network.txt. This function is a possible value for `erc-generate-log-file-name-function'." (require 'erc-networks) |