From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#20202: 24.3; Comint mode sets a bad $EMACS Date: Thu, 09 Apr 2015 11:02:29 -0400 Message-ID: References: <21779.11347.198784.304481@home.barzilay.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428591804 32722 80.91.229.3 (9 Apr 2015 15:03:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 9 Apr 2015 15:03:24 +0000 (UTC) Cc: 20202-done@debbugs.gnu.org To: Eli Barzilay Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Apr 09 17:03:15 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YgDz8-0007FT-Vg for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Apr 2015 17:03:15 +0200 Original-Received: from localhost ([::1]:35164 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgDz8-0005Pe-6G for geb-bug-gnu-emacs@m.gmane.org; Thu, 09 Apr 2015 11:03:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgDz4-0005Mc-3H for bug-gnu-emacs@gnu.org; Thu, 09 Apr 2015 11:03:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YgDyx-0007WQ-4i for bug-gnu-emacs@gnu.org; Thu, 09 Apr 2015 11:03:09 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:33272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YgDyx-0007WG-2O for bug-gnu-emacs@gnu.org; Thu, 09 Apr 2015 11:03:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YgDyw-0005hP-Rv for bug-gnu-emacs@gnu.org; Thu, 09 Apr 2015 11:03:02 -0400 Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 09 Apr 2015 15:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 20202 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 20202@debbugs.gnu.org, monnier@IRO.UMontreal.CA, eli@barzilay.org Original-Received: via spool by 20202-done@debbugs.gnu.org id=D20202.142859175421859 (code D ref 20202); Thu, 09 Apr 2015 15:03:02 +0000 Original-Received: (at 20202-done) by debbugs.gnu.org; 9 Apr 2015 15:02:34 +0000 Original-Received: from localhost ([127.0.0.1]:51279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgDyT-0005gU-HN for submit@debbugs.gnu.org; Thu, 09 Apr 2015 11:02:33 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:34591) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgDyS-0005gN-0M for 20202-done@debbugs.gnu.org; Thu, 09 Apr 2015 11:02:32 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t39F2Tva009939; Thu, 9 Apr 2015 11:02:29 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 4C7172D4A; Thu, 9 Apr 2015 11:02:29 -0400 (EDT) In-Reply-To: (Eli Barzilay's message of "Sat, 28 Mar 2015 11:27:35 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5271=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5271> : inlines <2670> : streams <1419631> : uri <1902569> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:101335 Archived-At: > Yeah, that's what I thought. FWIW, to avoid it for now, I've made my > Emacs set it to "emacs" and it looks like that works fine for builds. I've just installed the patch below into master, which should fix this problem, Stefan diff --git a/lisp/comint.el b/lisp/comint.el index 31649ff..2769c87 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -816,8 +816,6 @@ series of processes in the same Comint buffer. The hook (format "COLUMNS=%d" (window-width))) (list "TERM=emacs" (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width)))) - (unless (getenv "EMACS") - (list "EMACS=t")) (list (format "INSIDE_EMACS=%s,comint" emacs-version)) process-environment)) (default-directory diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index f59c5fb..3f006e8 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -496,7 +496,6 @@ as given in your `~/.profile'." (defcustom tramp-remote-process-environment `("TMOUT=0" "LC_CTYPE=''" ,(format "TERM=%s" tramp-terminal-type) - "EMACS=t" ;; Deprecated. ,(format "INSIDE_EMACS='%s,tramp:%s'" emacs-version tramp-version) "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH=" "PAGER=cat" "autocorrect=" "correct=") diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 362bbf5..9d36e91 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1666,11 +1666,7 @@ Returns the compilation buffer created." (list "TERM=emacs" (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width)))) - ;; Set the EMACS variable, but - ;; don't override users' setting of $EMACS. - (unless (getenv "EMACS") - (list "EMACS=t")) - (list "INSIDE_EMACS=t") + (list (format "INSIDE_EMACS=%s,compile" emacs-version)) (copy-sequence process-environment)))) (set (make-local-variable 'compilation-arguments) (list command mode name-function highlight-regexp)) diff --git a/lisp/term.el b/lisp/term.el index 43138fa..4c82986 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -1505,11 +1505,6 @@ Using \"emacs\" loses, because bash disables editing if $TERM == emacs.") (format "TERMINFO=%s" data-directory) (format term-termcap-format "TERMCAP=" term-term-name term-height term-width) - ;; We are going to get rid of the binding for EMACS, - ;; probably in Emacs 23, because it breaks - ;; `./configure' of some packages that expect it to - ;; say where to find EMACS. - (format "EMACS=%s (term:%s)" emacs-version term-protocol-version) (format "INSIDE_EMACS=%s,term:%s" emacs-version term-protocol-version) (format "LINES=%d" term-height) (format "COLUMNS=%d" term-width))