summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2012-12-29 00:05:17 -0800
committerGlenn Morris <rgm@gnu.org>2012-12-29 00:05:17 -0800
commitaf9bf0ca609858ae50be3417e6c1c26444092b3d (patch)
tree3dab95d18091114ffc6f4fc24d3df83661dd9405
parent7a3a74936f32dd6f3778b7d15264ec843e203f04 (diff)
downloademacs-af9bf0ca609858ae50be3417e6c1c26444092b3d.tar.gz
Backport gnus-msg fix from trunk
* lisp/gnus/gnus-msg.el (gnus-summary-resend-message): Don't bug out on non-string posting styles. Fixes: debbugs:13285
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-msg.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 1ece8bf9107..fda1b080903 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-27 Lars Ingebrigtsen <larsi@gnus.org>
+
+ * gnus-msg.el (gnus-summary-resend-message): Don't bug out on
+ non-string posting styles (bug#13285).
+
2012-12-27 Glenn Morris <rgm@gnu.org>
* plstore.el (plstore-passphrase-callback-function):
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 77bb6281bc4..c967bc06565 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1384,7 +1384,8 @@ For the \"inline\" alternatives, also see the variable
(dolist (style (if styles
(append gnus-posting-styles (list (cons ".*" styles)))
gnus-posting-styles))
- (when (string-match (pop style) gnus-newsgroup-name)
+ (when (and (stringp (car style))
+ (string-match (pop style) gnus-newsgroup-name))
(when (setq tem (cadr (assq 'name style)))
(setq user-full-name tem))
(when (setq tem (cadr (assq 'address style)))