diff options
| author | F. Jason Park | 2022-10-07 21:55:30 -0700 |
|---|---|---|
| committer | F. Jason Park | 2022-10-10 18:48:01 -0700 |
| commit | 4a1a4bf0e2dfe3987b18cfd2122d43db1e8a58c1 (patch) | |
| tree | 0c73a2a2b6e5f799d6d3664da2d6394c27820ad8 | |
| parent | 92703e00dc44af604355858bf227b07e99fb2c4c (diff) | |
| download | emacs-4a1a4bf0e2dfe3987b18cfd2122d43db1e8a58c1.tar.gz emacs-4a1a4bf0e2dfe3987b18cfd2122d43db1e8a58c1.zip | |
Accommodate missing spec values in erc-format-message
* lisp/erc/erc.el (erc-format-message): Although not mentioned in its
log message, commit 5281946fbf6b3cdbec5ce82e0057c71849faf4d2 "Make
format-spec accept function substitutions" also fixed a bug involving
the `ignore-missing' parameter of `format-spec'. Until now, ERC has
been relying on the old behavior to gracefully handle malformed server
messages. This commit tries to regain that functionality.
| -rw-r--r-- | lisp/erc/erc.el | 4 |
1 files changed, 3 insertions, 1 deletions
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." | |||
| 6961 | 6961 | ||
| 6962 | (defvar tabbar--local-hlf) | 6962 | (defvar tabbar--local-hlf) |
| 6963 | 6963 | ||
| 6964 | ;; FIXME when 29.1 is cut and `format-spec' is added to ELPA Compat, | ||
| 6965 | ;; remove the function invocations from the spec form below. | ||
| 6964 | (defun erc-update-mode-line-buffer (buffer) | 6966 | (defun erc-update-mode-line-buffer (buffer) |
| 6965 | "Update the mode line in a single ERC buffer BUFFER." | 6967 | "Update the mode line in a single ERC buffer BUFFER." |
| 6966 | (with-current-buffer buffer | 6968 | (with-current-buffer buffer |
| @@ -7325,7 +7327,7 @@ See also `format-spec'." | |||
| 7325 | (error "No format spec for message %s" msg)) | 7327 | (error "No format spec for message %s" msg)) |
| 7326 | (when (functionp entry) | 7328 | (when (functionp entry) |
| 7327 | (setq entry (apply entry args))) | 7329 | (setq entry (apply entry args))) |
| 7328 | (format-spec entry (apply #'format-spec-make args)))) | 7330 | (format-spec entry (apply #'format-spec-make args) 'ignore))) |
| 7329 | 7331 | ||
| 7330 | ;;; Various hook functions | 7332 | ;;; Various hook functions |
| 7331 | 7333 | ||