[Emacs-diffs] Changes to emacs/lisp/man.el

[Richard M. Stallman]

Index: emacs/lisp/man.el
diff -c emacs/lisp/man.el:1.111 emacs/lisp/man.el:1.112
*** emacs/lisp/man.el:1.111     Sun Jan 13 04:58:40 2002
--- emacs/lisp/man.el   Tue Oct 15 13:41:26 2002
***************
*** 593,598 ****
--- 593,615 ----
            (default-directory "/"))
        ;; Prevent any attempt to use display terminal fanciness.
        (setenv "TERM" "dumb")
+       ;; In Debian Woody, at least, we get overlong lines under X
+       ;; unless COLUMNS or MANWIDTH is set.  This isn't a problem on
+       ;; a tty.  man(1) says:
+       ;;        MANWIDTH
+       ;;               If $MANWIDTH is set, its value is used as the  line
+       ;;               length  for which manual pages should be formatted.
+       ;;               If it is not set, manual pages  will  be  formatted
+       ;;               with  a line length appropriate to the current ter-
+       ;;               minal (using an ioctl(2) if available, the value of
+       ;;               $COLUMNS,  or falling back to 80 characters if nei-
+       ;;               ther is available).
+       (if window-system
+           (unless (or (getenv "MANWIDTH") (getenv "COLUMNS"))
+             ;; This isn't strictly correct, since we don't know how
+             ;; the page will actually be displayed, but it seems
+             ;; reasonable.
+             (setenv "COLUMNS" (number-to-string (frame-width)))))
        (if (fboundp 'start-process)
            (set-process-sentinel
             (start-process manual-program buffer "sh" "-c"
***************
*** 656,662 ****
       )))
  
  (defun Man-softhyphen-to-minus ()
!   ;; \255 is some kind of dash in Latin-N.  Versions of Debian man, at
    ;; least, emit it even when not in a Latin-N locale.
    (unless (eq t (compare-strings "latin-" 0 nil
                                 current-language-environment 0 6 t))
--- 673,679 ----
       )))
  
  (defun Man-softhyphen-to-minus ()
!   ;; \255 is SOFT HYPHEN in Latin-N.  Versions of Debian man, at
    ;; least, emit it even when not in a Latin-N locale.
    (unless (eq t (compare-strings "latin-" 0 nil
                                 current-language-environment 0 6 t))