(comint-exec-1): Handle both termcap and terminfo.

diff --git a/lisp/comint.el b/lisp/comint.el
index 11e49d4fdb7965cd01ef53934fdbb22329e4c63e..8be11e72219a91423d4587ecb0eb00076950a0dc 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -553,9 +553,13 @@ buffer.  The hook `comint-exec-hook' is run after each exec."
 
 (defun comint-exec-1 (name buffer command switches)
   (let ((process-environment
-        (nconc (list "EMACS=t" "TERM=emacs"
-                     (format "TERMCAP=emacs:co#%d:tc=unknown" (frame-width)))
-               process-environment)))
+        (nconc
+         (if (and (boundp 'system-uses-terminfo) system-uses-terminfo)
+             (list "EMACS=t" "TERM=unknown"
+                   (format "COLUMNS=%d" (frame-width)))
+           (list "EMACS=t" "TERM=emacs"
+                 (format "TERMCAP=emacs:co#%d:tc=unknown" (frame-width))))
+         process-environment)))
     (apply 'start-process name buffer command switches)))
 \f
 ;;; Input history processing in a buffer