* lisp/man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc9f6f83c5d97b9ece7365628dcf1c251e751b1c..f06ca5bfaf9a4cdd9e7d617438b283d3cf5b3f8e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-08  Glenn Morris  <rgm@gnu.org>
 
+       * man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.
+
        * net/browse-url.el (browse-url-firefox):
        Test system-type, not system-configuration.
 

diff --git a/lisp/man.el b/lisp/man.el
index c8c2f8653e214c262dcaf36df63a45cdb15e1a3a..7a9e6e3cca534addfce03d4b0d61ac7e34b866f6 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -254,8 +254,7 @@ Used in `bookmark-set' to get the default bookmark name."
   "Regular expression describing a manpage section within parentheses.")
 
 (defvar Man-page-header-regexp
-  (if (and (string-match "-solaris2\\." system-configuration)
-          (not (string-match "-solaris2\\.[123435]$" system-configuration)))
+  (if (string-match "-solaris2\\." system-configuration)
       (concat "^[-A-Za-z0-9_].*[ \t]\\(" Man-name-regexp
              "(\\(" Man-section-regexp "\\))\\)$")
     (concat "^[ \t]*\\(" Man-name-regexp