[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/gnorb e1dae56 430/449: [gnorb] Only output summary-line
From: |
Stefan Monnier |
Subject: |
[elpa] externals/gnorb e1dae56 430/449: [gnorb] Only output summary-line info if registry exists, bump |
Date: |
Fri, 27 Nov 2020 23:16:26 -0500 (EST) |
branch: externals/gnorb
commit e1dae565570f19bf18a12ae5e8bd2bb3904a5112
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
[gnorb] Only output summary-line info if registry exists, bump
See Emacs bug #36903
* packages/gnorb/gnorb-gnus.el (gnorb-gnus-insert-format-letter-maybe):
(gnorb-gnus-insert-format-tags): Don't access the registry if it's
not been initialized. See bug report for corner case.
* packages/gnorb/gnorb.el: Bump to 1.6.2.
---
gnorb-gnus.el | 52 ++++++++++++++++++++++++++++------------------------
gnorb.el | 2 +-
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/gnorb-gnus.el b/gnorb-gnus.el
index a531002..15c83b5 100644
--- a/gnorb-gnus.el
+++ b/gnorb-gnus.el
@@ -986,21 +986,23 @@ option `gnorb-gnus-hint-relevant-article' is non-nil."
(add-hook 'gnus-select-article-hook 'gnorb-gnus-hint-relevant-message)
(defun gnorb-gnus-insert-format-letter-maybe (header)
- (if (not (or (gnus-ephemeral-group-p gnus-newsgroup-name)
- (gnus-virtual-group-p gnus-newsgroup-name)))
- (let* ((id (mail-header-message-id header))
- ;; Use lower-level accessor to avoid creating an entry
- ;; where there wasn't one. This function doesn't respect
- ;; ignored registry groups.
- (entry (nth 1 (assoc id (registry-lookup
- gnus-registry-db
- (list id))))))
- (cond ((cdr-safe (assq 'gnorb-ids entry))
- gnorb-gnus-summary-tracked-mark)
- ((gnorb-find-tracked-headings header)
- gnorb-gnus-summary-mark)
- (t " ")))
- " "))
+ (if (hash-table-p gnus-registry-db)
+ (if (not (or (gnus-ephemeral-group-p gnus-newsgroup-name)
+ (gnus-virtual-group-p gnus-newsgroup-name)))
+ (let* ((id (mail-header-message-id header))
+ ;; Use lower-level accessor to avoid creating an entry
+ ;; where there wasn't one. This function doesn't respect
+ ;; ignored registry groups.
+ (entry (nth 1 (assoc id (registry-lookup
+ gnus-registry-db
+ (list id))))))
+ (cond ((cdr-safe (assq 'gnorb-ids entry))
+ gnorb-gnus-summary-tracked-mark)
+ ((gnorb-find-tracked-headings header)
+ gnorb-gnus-summary-mark)
+ (t " ")))
+ " ")
+ ""))
(defalias (intern (concat "gnus-user-format-function-"
gnorb-gnus-summary-mark-format-letter))
@@ -1008,15 +1010,17 @@ option `gnorb-gnus-hint-relevant-article' is non-nil."
(gnorb-gnus-insert-format-letter-maybe header)))
(defun gnorb-gnus-insert-format-tags (header)
- (let* ((id (mail-header-message-id header))
- (entry (nth 1 (assoc id (registry-lookup
- gnus-registry-db
- (list id)))))
- (tags (cdr-safe (assq 'org-tags entry))))
- (if tags
- (concat
- ":" (mapconcat #'identity tags ":") ":")
- "")))
+ (if (hash-table-p gnus-registry-db)
+ (let* ((id (mail-header-message-id header))
+ (entry (nth 1 (assoc id (registry-lookup
+ gnus-registry-db
+ (list id)))))
+ (tags (cdr-safe (assq 'org-tags entry))))
+ (if tags
+ (concat
+ ":" (mapconcat #'identity tags ":") ":")
+ ""))
+ ""))
(defalias (intern (concat "gnus-user-format-function-"
gnorb-gnus-summary-tags-format-letter))
diff --git a/gnorb.el b/gnorb.el
index a872377..0253673 100644
--- a/gnorb.el
+++ b/gnorb.el
@@ -2,7 +2,7 @@
;; Copyright (C) 2018 Free Software Foundation, Inc.
-;; Version: 1.6.1
+;; Version: 1.6.2
;; Package-Requires: ((cl-lib "0.5"))
;; Maintainer: Eric Abrahamsen <eric@ericabrahamsen.net>
- [elpa] externals/gnorb 8c333ee 281/449: Merge pull request #20 from totherme/master, (continued)
- [elpa] externals/gnorb 8c333ee 281/449: Merge pull request #20 from totherme/master, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 8e705ea3 380/449: Sneakily add basic EBDB support to Gnorb, bump to 1.3.0, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 4b5a5a1 389/449: Gnorb: Tweak manual a bit, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 5672545 396/449: Gnorb: Typo, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 14ac82a 418/449: [gnorb] Use unwind-protect around the trigger process, bump to 1.5.4, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 471883d 394/449: Gnorb: Only add one registry-related hook to the Org capture process, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb babfa5c 393/449: Fix to after capture function, bump to 1.3.4, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb a6916b6 402/449: Allow gnorb-msg-id-request-head to accept a "group" argument, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb a1c8f0e 417/449: [gnorb] Small gnorb-org bugs, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 034f10a 434/449: [gnorb] Use characterp, not numberp, for testing register key, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb e1dae56 430/449: [gnorb] Only output summary-line info if registry exists, bump,
Stefan Monnier <=
- [elpa] externals/gnorb c3279d2 284/449: Fix tracking messages from virtual groups, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 41c6778 286/449: nngnorb should be a virtual server, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 6e6ee46 285/449: Zap another with-eval-after-load, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 09679fa 287/449: Misspelled function name, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb f585c03 290/449: condition-case the incoming trigger process, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 821a6b2 289/449: Allow bulk association of messages, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 9d64acb 292/449: Update gnorb-registry-capture to use convenience funcs, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb cc7d45b 291/449: Be more careful handling org tags on BBDB records, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 84ff7a7 294/449: Don't let attach errors derail the trigger process, Stefan Monnier, 2020/11/27
- [elpa] externals/gnorb 9c910c9 296/449: Re-raise errors in the triggering process, Stefan Monnier, 2020/11/27