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

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

diff --git a/lisp/help.el b/lisp/help.el
index 80cbdcea6f665ef0044a0dcb32b664cb15cb6188..220b35ae497ad1a16f4e7ae0a9dc2c11bb88e49c 100644 (file)
--- 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))