(Man-getpage-in-background): Bind inhibit-eol-conversion

to t before calling start-process or call-process.
(Man-softhyphen-to-minus): New function.  If
enable-multibyte-characters is non-nil, convert the code 0255 only
when it is not a part of a multibyte characters.
(Man-fontify-manpage): Call Man-softhyphen-to-minus.
(Man-cleanup-manpage): Likewise.

1 files changed, 11 insertions, 6 deletions

diff --git a/lisp/man.el b/lisp/man.el
index d40fc2fe8a4..a05e2462e4b 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -640,6 +640,15 @@ See the variable `Man-notify-method' for the different notification behaviors."
       (message ""))
      )))
 
+(defun Man-softhyphen-to-minus ()
+  ;; \255 is some kind of dash in Latin-1.
+  (goto-char (point-min))
+  (if enable-multibyte-characters
+      (while (search-forward "\255" nil t)
+	(if (= (preceding-char) ?\255)
+	    (replace-match "-")))
+    (while (search-forward "\255" nil t) (replace-match "-"))))
+
 (defun Man-fontify-manpage ()
   "Convert overstriking and underlining to the correct fonts.
 Same for the ANSI bold and normal escape sequences."
@@ -673,9 +682,7 @@ Same for the ANSI bold and normal escape sequences."
   (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t)
     (replace-match "+")
     (put-text-property (1- (point)) (point) 'face 'bold))
-  ;; \255 is some kind of dash in Latin-1.
-  (goto-char (point-min))
-  (while (search-forward "\255" nil t) (replace-match "-"))
+  (Man-softhyphen-to-minus)
   (message "%s man page made up" Man-arguments))
 
 (defun Man-cleanup-manpage ()
@@ -699,9 +706,7 @@ Same for the ANSI bold and normal escape sequences."
 	))
   (goto-char (point-min))
   (while (re-search-forward "[-|]\\(\b[-|]\\)+" nil t) (replace-match "+"))
-  ;; \255 is some kind of dash in Latin-1.
-  (goto-char (point-min))
-  (while (search-forward "\255" nil t) (replace-match "-"))
+  (Man-softhyphen-to-minus)
   (message "%s man page cleaned up" Man-arguments))
 
 (defun Man-bgproc-sentinel (process msg)