[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 7bcf3b2: [gnorb] Only output summary-line info if registry
From: |
Eric Abrahamsen |
Subject: |
[elpa] master 7bcf3b2: [gnorb] Only output summary-line info if registry exists, bump |
Date: |
Thu, 19 Sep 2019 13:49:05 -0400 (EDT) |
branch: master
commit 7bcf3b2708910b8d56149bd994bcb6a02d4b6099
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>
[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.
---
packages/gnorb/gnorb-gnus.el | 52 ++++++++++++++++++++++++--------------------
packages/gnorb/gnorb.el | 2 +-
2 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/packages/gnorb/gnorb-gnus.el b/packages/gnorb/gnorb-gnus.el
index a531002..15c83b5 100644
--- a/packages/gnorb/gnorb-gnus.el
+++ b/packages/gnorb/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/packages/gnorb/gnorb.el b/packages/gnorb/gnorb.el
index 6bf9665..103cddd 100644
--- a/packages/gnorb/gnorb.el
+++ b/packages/gnorb/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 <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master 7bcf3b2: [gnorb] Only output summary-line info if registry exists, bump,
Eric Abrahamsen <=