auto upstream

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9968c82faeb..be531be941e 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)))