aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-04-07 20:30:26 -0700
committerGlenn Morris2011-04-07 20:30:26 -0700
commita1de6c6a0558bc86a841b3ee4b61c237748bedc2 (patch)
treef8da74ef5bd2c159252e680c465339e33baefa67
parent3c4671f4096ef79964cd6b6722ea54108f67d248 (diff)
downloademacs-a1de6c6a0558bc86a841b3ee4b61c237748bedc2.tar.gz
emacs-a1de6c6a0558bc86a841b3ee4b61c237748bedc2.zip
* lisp/man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/man.el3
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 @@
12011-04-08 Glenn Morris <rgm@gnu.org> 12011-04-08 Glenn Morris <rgm@gnu.org>
2 2
3 * man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported.
4
3 * net/browse-url.el (browse-url-firefox): 5 * net/browse-url.el (browse-url-firefox):
4 Test system-type, not system-configuration. 6 Test system-type, not system-configuration.
5 7
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."
254 "Regular expression describing a manpage section within parentheses.") 254 "Regular expression describing a manpage section within parentheses.")
255 255
256(defvar Man-page-header-regexp 256(defvar Man-page-header-regexp
257 (if (and (string-match "-solaris2\\." system-configuration) 257 (if (string-match "-solaris2\\." system-configuration)
258 (not (string-match "-solaris2\\.[123435]$" system-configuration)))
259 (concat "^[-A-Za-z0-9_].*[ \t]\\(" Man-name-regexp 258 (concat "^[-A-Za-z0-9_].*[ \t]\\(" Man-name-regexp
260 "(\\(" Man-section-regexp "\\))\\)$") 259 "(\\(" Man-section-regexp "\\))\\)$")
261 (concat "^[ \t]*\\(" Man-name-regexp 260 (concat "^[ \t]*\\(" Man-name-regexp