(woman-mode): Restore tab-width value after the call to Man-mode, since

Man-mode resets it to the default, and that makes right	margin extend
beyond woman-fill-column.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a73baf726057337bbda284cc4b196d67f883acf..bf139ce94a6122eaebbc1adaaea35c91e24aac4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
 
        * woman.el (woman-parse-colon-path): Return a list even if there's
        only one directory in PATHS.
+       (woman-mode): Restore tab-width value after the call to Man-mode,
+       since Man-mode resets it to the default, and that makes right
+       margin extend beyond woman-fill-column.
 
        * man.el (Man-init-defvars) [windows-nt]: Use a special command
        list.  Don't invoke Awk.

diff --git a/lisp/woman.el b/lisp/woman.el
index 5fbb5ef6fdb6c622a78b35c4bdd798c5deba93c4..b7b856c9b0872287e3441cf16f4a92a48881b579 100644 (file)
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1949,7 +1949,8 @@ See `Man-mode' for additional details."
       (fset 'Man-build-page-list Man-build-page-list)
       (fset 'Man-strip-page-headers Man-strip-page-headers)
       (fset 'Man-unindent Man-unindent)
-      (fset 'Man-goto-page Man-goto-page)))
+      (fset 'Man-goto-page Man-goto-page)
+      (setq tab-width woman-tab-width)))
   (setq major-mode 'woman-mode
        mode-name "WoMan")
   ;; Don't show page numbers like Man-mode does.  (Online documents do