(print-help-return-message): Handle cons cells

in special-display-regexps and special-display-buffer-names.

1 files changed, 6 insertions, 1 deletions

diff --git a/lisp/help.el b/lisp/help.el
index 80cbdcea6f6..220b35ae497 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -139,11 +139,16 @@ If FUNCTION is nil, applies `message' to it, thus printing it."
        (let ((first-message
               (cond ((or (member (buffer-name standard-output)
                                  special-display-buffer-names)
+                         (assoc (buffer-name standard-output)
+                                special-display-buffer-names)
                          (let (found
                                (tail special-display-regexps)
                                (name (buffer-name standard-output)))
                            (while (and tail (not found))
-                             (if (string-match (car tail) name)
+                             (if (or (and (consp (car taiul))
+                                          (string-match (car (car tail)) name))
+                                     (and (stringp (car tail))
+                                          (string-match (car tail) name)))
                                  (setq found t))
                              (setq tail (cdr tail)))
                            found))