Re: comint.el: EMACS environment variable

[Kim F. Storm]

Richard Stallman <address@hidden> writes:

> I think we will have fewer bugs if we put EMACS back to t.
>
> So let's set both EMACS and INSIDE_EMACS to t.

Here is a patch:

*** comint.el   29 Sep 2006 10:48:53 +0200      1.348
--- comint.el   17 Nov 2006 16:43:23 +0100
***************
*** 769,775 ****
            (list "TERM=emacs"
                  (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
          (unless (getenv "EMACS")
!           (list (concat "EMACS=" invocation-directory invocation-name)))
          process-environment))
        (default-directory
          (if (file-accessible-directory-p default-directory)
--- 769,778 ----
            (list "TERM=emacs"
                  (format "TERMCAP=emacs:co#%d:tc=unknown:" (window-width))))
          (unless (getenv "EMACS")
!           ;; This is for Emacs 23:
!           ;; (list (concat "EMACS=" invocation-directory invocation-name))
!           (list "EMACS=t"))
!         (list "INSIDE_EMACS=t")
          process-environment))
        (default-directory
          (if (file-accessible-directory-p default-directory)

*** compile.el  11 Nov 2006 23:17:37 +0100      1.411
--- compile.el  17 Nov 2006 15:52:53 +0100
***************
*** 1069,1075 ****
              ;; Set the EMACS variable, but
              ;; don't override users' setting of $EMACS.
              (unless (getenv "EMACS")
!               (list (concat "EMACS=" invocation-directory invocation-name)))
              (copy-sequence process-environment))))
        (set (make-local-variable 'compilation-arguments)
             (list command mode name-function highlight-regexp))
--- 1069,1078 ----
              ;; Set the EMACS variable, but
              ;; don't override users' setting of $EMACS.
              (unless (getenv "EMACS")
!               ;; This is for Emacs 23:
!               ;; (list (concat "EMACS=" invocation-directory invocation-name))
!               '("EMACS=t"))
!             '("INSIDE_EMACS=t")
              (copy-sequence process-environment))))
        (set (make-local-variable 'compilation-arguments)
             (list command mode name-function highlight-regexp))


*** misc.texi   12 Sep 2006 23:49:59 +0200      1.93
--- misc.texi   17 Nov 2006 17:16:03 +0100      
***************
*** 486,497 ****
  @kbd{C-x @key{RET} p} in the shell buffer.  @xref{Communication
  Coding}.
  
  @cindex @env{EMACS} environment variable
    Unless the environment variable @env{EMACS} is already defined,
! Emacs defines it in the subshell, with value equal to Emacs's absolute
! file name.  A shell script
! can check this variable to determine whether it has been run from an
! Emacs subshell.
  
  @node Shell Mode
  @subsection Shell Mode
--- 486,507 ----
  @kbd{C-x @key{RET} p} in the shell buffer.  @xref{Communication
  Coding}.
  
+ @cindex @env{INSIDE_EMACS} environment variable
+   Emacs unconditionally defines the environment variable
+ @env{INSIDE_EMACS} in the subshell, with value @code{t}.  A shell
+ script can check this variable to determine whether it has been run
+ from an Emacs subshell.  This variable is new in Emacs 22, and
+ supersedes the @env{EMACS} environment variable.
+ 
  @cindex @env{EMACS} environment variable
    Unless the environment variable @env{EMACS} is already defined,
! Emacs defines it in the subshell, with value @code{t}.
! 
! @strong{Warning:} Checking this variable to test whether a shell
! script is being run inside Emacs is deprecated, and from Emacs 23 its
! value will change to be equal to Emacs's absolute file name.  New and
! existing programs should be changed to check @env{INSIDE_EMACS} before
! @env{EMACS}.
  
  @node Shell Mode
  @subsection Shell Mode

*** NEWS        15 Nov 2006 13:44:34 +0100      1.1405
--- NEWS        17 Nov 2006 17:21:19 +0100      
***************
*** 1455,1462 ****
  but declared obsolete.
  
  +++
! *** The EMACS environment variable now defaults to Emacs's absolute
! file name, instead of to "t".
  
  ** M-x Compile changes:
  
--- 1455,1466 ----
  but declared obsolete.
  
  +++
! *** The new INSIDE_EMACS environment variable is set unconditionally
! to the value "t".  It supersedes the EMACS environment variable, which
! is planned to change value to Emacs's absolute file name in Emacs 23.
! 
! Programs that need to know whether they are started inside Emacs,
! should check INSIDE_EMACS before checking EMACS.
  
  ** M-x Compile changes:
  

--
Kim F. Storm <address@hidden> http://www.cua.dk