aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Danjou2012-09-11 10:08:59 +0000
committerKatsumi Yamaoka2012-09-11 10:08:59 +0000
commit95729d50c034ddf60bc18f04ce5a2cbb365bd8bb (patch)
tree83639cae2cbc4548c67d42edea23ebba531e0e35
parent9d9edd4baee38b48b7c33a22e25a3a5b8779e41a (diff)
downloademacs-95729d50c034ddf60bc18f04ce5a2cbb365bd8bb.tar.gz
emacs-95729d50c034ddf60bc18f04ce5a2cbb365bd8bb.zip
gnus-notifications.el: add nil checks
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-notifications.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5644c394f7e..5c7f106f6db 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12012-09-11 Julien Danjou <julien@danjou.info>
2
3 * gnus-notifications.el (gnus-notifications): Check for nil values in
4 ignored addresses check.
5
12012-09-10 Stefan Monnier <monnier@iro.umontreal.ca> 62012-09-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * qp.el (quoted-printable-decode-region): Inline+CSE+strength-reduction. 8 * qp.el (quoted-printable-decode-region): Inline+CSE+strength-reduction.
diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index f9c2d309a35..5104a56c6e7 100644
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/gnus-notifications.el
@@ -166,8 +166,10 @@ This is typically a function to add in
166 (or (mail-fetch-field "From") ""))) 166 (or (mail-fetch-field "From") "")))
167 (address (cadr address-components))) 167 (address (cadr address-components)))
168 ;; Ignore mails from ourselves 168 ;; Ignore mails from ourselves
169 (unless (gnus-string-match-p gnus-ignored-from-addresses 169 (unless (and gnus-ignored-from-addresses
170 address) 170 address
171 (gnus-string-match-p gnus-ignored-from-addresses
172 address))
171 (let* ((photo-file (gnus-notifications-get-photo-file address)) 173 (let* ((photo-file (gnus-notifications-get-photo-file address))
172 (notification-id (gnus-notifications-notify 174 (notification-id (gnus-notifications-notify
173 (or (car address-components) address) 175 (or (car address-components) address)