emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp man.el


From: Kevin Ryde
Subject: [Emacs-diffs] emacs/lisp man.el
Date: Wed, 25 Nov 2009 22:41:06 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Kevin Ryde <kryde>      09/11/25 22:41:06

Modified files:
        lisp           : man.el 

Log message:
        * man.el (Man-completion-table): default-directory "/" in case
        doesn't otherwise exist.  process-environment COLUMNS=999 so as
        not to truncate long names.  process-connection-type pipe to avoid
        any chance of hitting the pseudo-tty TIOCGWINSZ.  (Further to
        Bug#3717.)

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

Patches:
Index: man.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/man.el,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- man.el      25 Nov 2009 21:17:07 -0000      1.189
+++ man.el      25 Nov 2009 22:41:06 -0000      1.190
@@ -761,14 +761,18 @@
       (unless (and Man-completion-cache
                    (string-prefix-p (car Man-completion-cache) string))
       (with-temp-buffer
+       (setq default-directory "/") ;; in case inherited doesn't exist
         ;; Actually for my `man' the arg is a regexp.  Don't know how
         ;; standard that is.  Also, it's not clear what kind of
         ;; regexp are accepted: under GNU/Linux it seems it's ERE-style,
         ;; whereas under MacOSX it seems to be BRE-style and
         ;; doesn't accept backslashes at all.  Let's not bother to
         ;; quote anything.
+       (let ((process-connection-type nil) ;; pipe
+             (process-environment (copy-sequence process-environment)))
+         (setenv "COLUMNS" "999") ;; don't truncate long names
           (call-process manual-program nil '(t nil) nil
-                        "-k" (concat "^" string))
+                        "-k" (concat "^" string)))
         (goto-char (point-min))
         (while (re-search-forward "^[^ \t\n]+\\(?: (.+?)\\)?" nil t)
           (push (match-string 0) table)))




reply via email to

[Prev in Thread] Current Thread [Next in Thread]