(compilation-error-regexp-alist-alist) extend irix for NAG Fortran and add ftnchek-*

[gnu-emacs] / lisp / man.el

diff --git a/lisp/man.el b/lisp/man.el
index 5a07045dda92ae8b0889873aeffdfc6c81dc4caa..afd183fa720f0a0ec88e97f171a3d2affb86a2d2 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -733,7 +733,9 @@ all sections related to a subject, put something appropriate into the
        (if (fboundp 'start-process)
            (set-process-sentinel
             (start-process manual-program buffer
-                           (if (eq system-type 'cygwin) shell-file-name "sh")
+                           (if (memq system-type '(cygwin windows-nt))
+                               shell-file-name
+                             "sh")
                            shell-command-switch
                            (format (Man-build-man-command) man-args))
             'Man-bgproc-sentinel)
@@ -891,12 +893,15 @@ header file(#include <foo.h>) and files in FILES"
         'Man-target-string (match-string target-pos)
         )))))
 
-(defun Man-cleanup-manpage ()
-  "Remove overstriking and underlining from the current buffer."
-  (interactive)
+(defun Man-cleanup-manpage (&optional interactive)
+  "Remove overstriking and underlining from the current buffer.
+Normally skip any jobs that should have been done by the sed script,
+but when called interactively, do those jobs even if the sed
+script would have done them."
+  (interactive "p")
   (message "Please wait: cleaning up the %s man page..."
           Man-arguments)
-  (if (or (interactive-p) (not Man-sed-script))
+  (if (or interactive (not Man-sed-script))
       (progn
        (goto-char (point-min))
        (while (search-forward "_\b" nil t) (backward-delete-char 2))