diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-10-15 17:38:30 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-10-15 17:38:30 +0200 |
| commit | 01e45efcd44e92dd259283df0e62653c7c20e9cc (patch) | |
| tree | 552c1a6ce7d52b897cf5f089d6c589921efbe9bd /lisp/erc | |
| parent | 982c0e6c15535defcf6ac3c4d4169708c60efc18 (diff) | |
| parent | 5933055a3e7387b0095f0df7876a208ab15f4f45 (diff) | |
| download | emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.tar.gz emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.tar.bz2 emacs-01e45efcd44e92dd259283df0e62653c7c20e9cc.zip | |
Merge branch 'master' into feature/package+vc
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog.1 | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index 0ea7ef09aa7..8fc97854303 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -3779,7 +3779,7 @@ doesn't appear). * NEWS: Added the information from - http://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer + https://emacswiki.org/cgi-bin/wiki/ErcCvsFeatures and the newer changes which weren't yet documented on that page. 2005-01-06 Hoan Ton-That <hoan@ton-that.org> @@ -8298,7 +8298,7 @@ it doesn't move point to end-of-buffer in non-ERC buffers. Fixed erc-kill-buffer-function so it doesn't run the erc-kill-server-hook hooks if the server connection is closed. Fixed bug 658552, which is described in detail at - http://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125 + https://sourceforge.net/tracker/index.php?func=detail&aid=658552&group_id=30118&atid=398125 2002-12-26 Alex Schroeder <alex@gnu.org> diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index f128387bcf6..db39e341b2f 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -6961,6 +6961,8 @@ shortened server name instead." (defvar tabbar--local-hlf) +;; FIXME when 29.1 is cut and `format-spec' is added to ELPA Compat, +;; remove the function invocations from the spec form below. (defun erc-update-mode-line-buffer (buffer) "Update the mode line in a single ERC buffer BUFFER." (with-current-buffer buffer @@ -7325,7 +7327,7 @@ See also `format-spec'." (error "No format spec for message %s" msg)) (when (functionp entry) (setq entry (apply entry args))) - (format-spec entry (apply #'format-spec-make args)))) + (format-spec entry (apply #'format-spec-make args) 'ignore))) ;;; Various hook functions |