(Man-init-defvars) [windows-nt]: Use a special command list. Don't invoke Awk.

2 files changed, 50 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f97bf7cb240..4e0a1344bd1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-07  Eli Zaretskii  <eliz@gnu.org>
+
+        * man.el (Man-init-defvars) [windows-nt]: Use a special command
+        list.  Don't invoke Awk.
+
 2009-03-06  Glenn Morris  <rgm@gnu.org>
 
         * mail/rmailmm.el (rmail-mime-media-type-handlers-alist): Fix doc and
diff --git a/lisp/man.el b/lisp/man.el
index 9c2fa952fd2..3aadfa2d5e1 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -486,36 +486,51 @@ This is necessary if one wants to dump man.el with Emacs."
         (apply 'list
          (cons
           Man-sed-command
-          (list
-           (if Man-sed-script
-               (concat "-e '" Man-sed-script "'")
-             "")
-           "-e '/^[\001-\032][\001-\032]*$/d'"
-           "-e '/\e[789]/s///g'"
-           "-e '/Reformatting page.  Wait/d'"
-           "-e '/Reformatting entry.  Wait/d'"
-           "-e '/^[ \t]*Hewlett-Packard[ \t]Company[ \t]*-[ \t][0-9]*[ \t]-/d'"
-           "-e '/^[ \t]*Hewlett-Packard[ \t]*-[ \t][0-9]*[ \t]-.*$/d'"
-           "-e '/^[ \t][ \t]*-[ \t][0-9]*[ \t]-[ \t]*Formatted:.*[0-9]$/d'"
-           "-e '/^[ \t]*Page[ \t][0-9]*.*(printed[ \t][0-9\\/]*)$/d'"
-           "-e '/^Printed[ \t][0-9].*[0-9]$/d'"
-           "-e '/^[ \t]*X[ \t]Version[ \t]1[01].*Release[ \t][0-9]/d'"
-           "-e '/^[A-Za-z].*Last[ \t]change:/d'"
-           "-e '/^Sun[ \t]Release[ \t][0-9].*[0-9]$/d'"
-           "-e '/[ \t]*Copyright [0-9]* UNIX System Laboratories, Inc.$/d'"
-           "-e '/^[ \t]*Rev\\..*Page [0-9][0-9]*$/d'"
-           ))
-         (cons
-          Man-awk-command
-          (list
-           "'\n"
-           "BEGIN { blankline=0; anonblank=0; }\n"
-           "/^$/ { if (anonblank==0) next; }\n"
-           "{ anonblank=1; }\n"
-           "/^$/ { blankline++; next; }\n"
-           "{ if (blankline>0) { print \"\"; blankline=0; } print $0; }\n"
-           "'"
-           ))
+          (if (eq system-type 'windows-nt)
+              ;; Windows needs ".." quoting, not '..'.
+              (list
+               "-e \"/Reformatting page.  Wait/d\""
+               "-e \"/Reformatting entry.  Wait/d\""
+               "-e \"/^[ \t][ \t]*-[ \t][0-9]*[ \t]-[ \t]*Formatted:.*[0-9]$/d\""
+               "-e \"/^[ \t]*Page[ \t][0-9]*.*(printed[ \t][0-9\\/]*)$/d\""
+               "-e \"/^Printed[ \t][0-9].*[0-9]$/d\""
+               "-e \"/^[ \t]*X[ \t]Version[ \t]1[01].*Release[ \t][0-9]/d\""
+               "-e \"/^[A-Za-z].*Last[ \t]change:/d\""
+               "-e \"/[ \t]*Copyright [0-9]* UNIX System Laboratories, Inc.$/d\""
+               "-e \"/^[ \t]*Rev\\..*Page [0-9][0-9]*$/d\"")
+            (list
+             (if Man-sed-script
+                 (concat "-e '" Man-sed-script "'")
+               "")
+             "-e '/^[\001-\032][\001-\032]*$/d'"
+             "-e '/\e[789]/s///g'"
+             "-e '/Reformatting page.  Wait/d'"
+             "-e '/Reformatting entry.  Wait/d'"
+             "-e '/^[ \t]*Hewlett-Packard[ \t]Company[ \t]*-[ \t][0-9]*[ \t]-/d'"
+             "-e '/^[ \t]*Hewlett-Packard[ \t]*-[ \t][0-9]*[ \t]-.*$/d'"
+             "-e '/^[ \t][ \t]*-[ \t][0-9]*[ \t]-[ \t]*Formatted:.*[0-9]$/d'"
+             "-e '/^[ \t]*Page[ \t][0-9]*.*(printed[ \t][0-9\\/]*)$/d'"
+             "-e '/^Printed[ \t][0-9].*[0-9]$/d'"
+             "-e '/^[ \t]*X[ \t]Version[ \t]1[01].*Release[ \t][0-9]/d'"
+             "-e '/^[A-Za-z].*Last[ \t]change:/d'"
+             "-e '/^Sun[ \t]Release[ \t][0-9].*[0-9]$/d'"
+             "-e '/[ \t]*Copyright [0-9]* UNIX System Laboratories, Inc.$/d'"
+             "-e '/^[ \t]*Rev\\..*Page [0-9][0-9]*$/d'"
+             )))
+         ;; Windows doesn't support multi-line commands, so don't
+         ;; invoke Awk there.
+         (unless (eq system-type 'windows-nt)
+           (cons
+            Man-awk-command
+            (list
+             "'\n"
+             "BEGIN { blankline=0; anonblank=0; }\n"
+             "/^$/ { if (anonblank==0) next; }\n"
+             "{ anonblank=1; }\n"
+             "/^$/ { blankline++; next; }\n"
+             "{ if (blankline>0) { print \"\"; blankline=0; } print $0; }\n"
+             "'"
+             )))
          (if (not Man-uses-untabify-flag)
              ;; The outer list will be stripped off by apply.
              (list (cons