diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-04-07 20:30:26 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-04-07 20:30:26 -0700 |
| commit | a1de6c6a0558bc86a841b3ee4b61c237748bedc2 (patch) | |
| tree | f8da74ef5bd2c159252e680c465339e33baefa67 | |
| parent | 3c4671f4096ef79964cd6b6722ea54108f67d248 (diff) | |
| download | emacs-a1de6c6a0558bc86a841b3ee4b61c237748bedc2.tar.gz | |
* lisp/man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/man.el | 3 |
2 files changed, 3 insertions, 2 deletions
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 <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 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 |