* man.el (Man-init-defvars, Man-cleanup-manpage,

	Man-fontify-manpage): fix previous fix.

1 files changed, 13 insertions, 12 deletions

diff --git a/lisp/man.el b/lisp/man.el
index 86330bb9b5..919d1ad9e2 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -3,8 +3,8 @@
 ;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
 
 ;; Author:		Barry A. Warsaw <[email protected]>
-;; Last-Modified:	$Date: 1994/09/22 12:10:16 $
-;; Version:		$Revision: 1.49 $
+;; Last-Modified:	$Date: 1994/09/29 12:42:45 $
+;; Version:		$Revision: 1.50 $
 ;; Keywords:		help
 ;; Adapted-By:		ESR, pot
 
@@ -331,7 +331,7 @@ This is necessary if one wants to dump man.el with emacs."
 	 "")
        "-e '/\e[789]/s///g'"
        "-e '/o\b+/s//o/g'"
-       "-e '/|\b-/s//+/g'"
+       "-e '/|\b-[-|\b]*/s//+/g'"
        "-e '/^\\n$/D'"
        "-e '/[Nn]o such file or directory/d'"
        "-e '/Reformatting page.  Wait/d'"
@@ -616,15 +616,16 @@ Same for the ANSI bold and normal escape sequences."
   (while (re-search-forward "\e[789]" nil t)
     (backward-delete-char 2))
   (goto-char (point-min))
+  (while (re-search-forward "\\(.\\)\\(\b\\1\\)+" nil t)
+    (replace-match "\\1")
+    (put-text-property (1- (point)) (point) 'face 'bold))
+  (goto-char (point-min))
   (while (search-forward "o\b+" nil t)
     (backward-delete-char 2)
     (put-text-property (1- (point)) (point) 'face 'bold))
-  (while (search-forward "|\b-" nil t)
-    (replace-match "+")
-    (put-text-property (1- (point)) (point) 'face 'bold))
   (goto-char (point-min))
-  (while (re-search-forward "\\(.\\)\\(\b\\1\\)+" nil t)
-    (replace-match "\\1")
+  (while (re-search-forward "|\b-[-|\b]*" nil t)
+    (replace-match "+")
     (put-text-property (1- (point)) (point) 'face 'bold))
   (message "%s man page made up" Man-arguments))
 
@@ -641,12 +642,12 @@ Same for the ANSI bold and normal escape sequences."
   (goto-char (point-min))
   (while (re-search-forward "\e[789]" nil t) (backward-delete-char 2))
   (goto-char (point-min))
-  (while (search-forward "o\b+" nil t) (backward-delete-char 2))
-  (goto-char (point-min))
-  (while (search-forward "|\b-" nil t) (replace-match "+"))
-  (goto-char (point-min))
   (while (re-search-forward "\\(.\\)\\(\b\\1\\)+" nil t)
     (replace-match "\\1"))
+  (goto-char (point-min))
+  (while (search-forward "o\b+" nil t) (backward-delete-char 2))
+  (goto-char (point-min))
+  (while (re-search-forward "|\b-[-|\b]*" nil t) (replace-match "+"))
   (message "%s man page cleaned up" Man-arguments))
 
 (defun Man-bgproc-sentinel (process msg)