Commit a81223ae authored by Eric Abrahamsen's avatar Eric Abrahamsen

Only use Gnus registry for formatting when registry is loaded

See bug #36903

* lisp/gnus/gnus-registry.el (gnus-registry-article-marks-to-chars):
  (gnus-registry-article-marks-to-names): In some circumstances it's
  possible for the user's summary line format spec to include
  registry-specific code, while the registry itself isn't actually
  loaded. Make sure the database is actually a hashtable before
  accessing it.
parent 2b80340b
Pipeline #3209 passed with stage
in 54 minutes and 13 seconds
......@@ -1007,23 +1007,27 @@ Uses `gnus-registry-marks' to find what shortcuts to install."
;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-chars)
(defun gnus-registry-article-marks-to-chars (headers)
"Show the marks for an article by the :char property."
(let* ((id (mail-header-message-id headers))
(marks (when id (gnus-registry-get-id-key id 'mark))))
(concat (delq nil
(mapcar
(lambda (m)
(plist-get
(cdr-safe (assoc m gnus-registry-marks))
:char))
marks)))))
(if (hash-table-p gnus-registry-db)
(let* ((id (mail-header-message-id headers))
(marks (when id (gnus-registry-get-id-key id 'mark))))
(concat (delq nil
(mapcar
(lambda (m)
(plist-get
(cdr-safe (assoc m gnus-registry-marks))
:char))
marks))))
""))
;; use like this:
;; (defalias 'gnus-user-format-function-M 'gnus-registry-article-marks-to-names)
(defun gnus-registry-article-marks-to-names (headers)
"Show the marks for an article by name."
(let* ((id (mail-header-message-id headers))
(marks (when id (gnus-registry-get-id-key id 'mark))))
(mapconcat (lambda (mark) (symbol-name mark)) marks ",")))
(if (hash-table-p gnus-registry-db)
(let* ((id (mail-header-message-id headers))
(marks (when id (gnus-registry-get-id-key id 'mark))))
(mapconcat (lambda (mark) (symbol-name mark)) marks ","))
""))
(defun gnus-registry-read-mark ()
"Read a mark name from the user with completion."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment