(ediff-even-diff-face-A): Fix spelling.

[gnu-emacs] / lisp / man.el

diff --git a/lisp/man.el b/lisp/man.el
index 4f9177de797f52262437377869c0e97eaaba8f27..90c27adbc29e0e711d9a21e7b404e2edd333f366 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -254,8 +254,12 @@ the associated section number."
   "Regular expression describing a manpage section within parentheses.")
 
 (defvar Man-page-header-regexp
-  (concat "^[ \t]*\\(" Man-name-regexp
-         "(\\(" Man-section-regexp "\\))\\).*\\1")
+  (if (and (string-match "-solaris2\\." system-configuration)
+          (not (string-match "-solaris2\\.[123435]$" system-configuration)))
+      (concat "^[-A-Za-z0-9_].*[ \t]\\(" Man-name-regexp
+             "(\\(" Man-section-regexp "\\))\\)$")
+    (concat "^[ \t]*\\(" Man-name-regexp
+           "(\\(" Man-section-regexp "\\))\\).*\\1"))
   "Regular expression describing the heading of a page.")
 
 (defvar Man-heading-regexp "^\\([A-Z][A-Z ]+\\)$"
@@ -381,7 +385,8 @@ This is necessary if one wants to dump man.el with emacs."
            nil))))
 
   (setq Man-filter-list
-       (list
+       ;; Avoid trailing nil which confuses customize.
+       (apply 'list
         (cons
          Man-sed-command
          (list
@@ -415,9 +420,10 @@ This is necessary if one wants to dump man.el with emacs."
           "'"
           ))
         (if (not Man-uses-untabify-flag)
-            (cons
-             Man-untabify-command
-             Man-untabify-command-args)
+            ;; The outer list will be stripped off by apply.
+            (list (cons
+                   Man-untabify-command
+                   Man-untabify-command-args))
           )))
 )
 
@@ -1067,26 +1073,12 @@ Specify which reference to use; default is based on word at point."
 (defun Man-kill ()
   "Kill the buffer containing the manpage."
   (interactive)
-  (let ((buff (current-buffer)))
-    (delete-windows-on buff)
-    (kill-buffer buff))
-  (if (and window-system
-          (or (eq Man-notify-method 'newframe)
-              (and pop-up-frames
-                   (eq Man-notify-method 'bully))))
-      (delete-frame)))
+  (quit-window t))
 
 (defun Man-quit ()
   "Bury the buffer containing the manpage."
   (interactive)
-  (let ((buff (current-buffer)))
-    (delete-windows-on buff)
-    (bury-buffer buff))
-  (if (and window-system
-          (or (eq Man-notify-method 'newframe)
-              (and pop-up-frames
-                   (eq Man-notify-method 'bully))))
-      (delete-frame)))
+  (quit-window))
 
 (defun Man-goto-page (page)
   "Go to the manual page on page PAGE."