diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-06-22 00:20:03 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-06-22 00:20:03 +0200 |
| commit | c324e02f758550d007ceb55c7168e8734a1d27fa (patch) | |
| tree | bebf5f0a12ee80d5757eb134faaaee32b9da9052 /lisp/erc/erc-match.el | |
| parent | f0e9fdd1f9a9989b457cbc382e0cf12c161a8e6c (diff) | |
| parent | 9fe2bdb88a4ebd4b2286c1c2a2a2ba7411af01b6 (diff) | |
| download | emacs-c324e02f758550d007ceb55c7168e8734a1d27fa.tar.gz emacs-c324e02f758550d007ceb55c7168e8734a1d27fa.tar.bz2 emacs-c324e02f758550d007ceb55c7168e8734a1d27fa.zip | |
Merge remote-tracking branch 'savahnna/master' into dev
Diffstat (limited to 'lisp/erc/erc-match.el')
| -rw-r--r-- | lisp/erc/erc-match.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el index 3107ff2ccd1..0e98f2bc613 100644 --- a/lisp/erc/erc-match.el +++ b/lisp/erc/erc-match.el @@ -555,16 +555,15 @@ See `erc-log-match-format'." (and (eq erc-log-matches-flag 'away) (erc-away-time))) match-buffer-name) - (let ((line (format-spec erc-log-match-format - (format-spec-make - ?n nick - ?t (format-time-string - (or (and (boundp 'erc-timestamp-format) - erc-timestamp-format) - "[%Y-%m-%d %H:%M] ")) - ?c (or (erc-default-target) "") - ?m message - ?u nickuserhost)))) + (let ((line (format-spec + erc-log-match-format + `((?n . ,nick) + (?t . ,(format-time-string + (or (bound-and-true-p erc-timestamp-format) + "[%Y-%m-%d %H:%M] "))) + (?c . ,(or (erc-default-target) "")) + (?m . ,message) + (?u . ,nickuserhost))))) (with-current-buffer (erc-log-matches-make-buffer match-buffer-name) (let ((inhibit-read-only t)) (goto-char (point-max)) |