[Emacs-diffs] emacs/lisp man.el

[Eli Zaretskii]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Eli Zaretskii <eliz>    09/03/07 13:30:49

Modified files:
        lisp           : man.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/man.el?cvsroot=emacs&r1=1.184&r2=1.185

Patches:
Index: man.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/man.el,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- man.el      5 Jan 2009 03:19:32 -0000       1.184
+++ man.el      7 Mar 2009 13:30:47 -0000       1.185
@@ -486,6 +486,18 @@
        (apply 'list
         (cons
          Man-sed-command
+         (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 "'")
@@ -504,7 +516,10 @@
           "-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
@@ -515,7 +530,7 @@
           "/^$/ { 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