From: Glenn Morris Date: Fri, 8 Apr 2011 03:30:26 +0000 (-0700) Subject: * lisp/man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~370 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1de6c6a0558bc86a841b3ee4b61c237748bedc2;p=emacs.git * lisp/man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc9f6f83c5d..f06ca5bfaf9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-04-08 Glenn Morris + * 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 c8c2f8653e2..7a9e6e3cca5 100644 --- 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