diff options
| author | Stefan Monnier | 2007-08-31 07:33:10 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-31 07:33:10 +0000 |
| commit | 44de6f61c8144e96907db79076a55d2cda933599 (patch) | |
| tree | c39c1cbb6f03cd0f9dbd56a5809a2d677c258e91 /src/callproc.c | |
| parent | b12f6e85a068462962d1bf012260e2b55aabd4e7 (diff) | |
| download | emacs-44de6f61c8144e96907db79076a55d2cda933599.tar.gz emacs-44de6f61c8144e96907db79076a55d2cda933599.zip | |
(getenv_internal): Remove special case for $TERM.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/callproc.c b/src/callproc.c index d99dd8b90bb..3b9ef8d38e9 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -1519,7 +1519,6 @@ getenv_internal (var, varlen, value, valuelen, frame) | |||
| 1519 | Lisp_Object frame; | 1519 | Lisp_Object frame; |
| 1520 | { | 1520 | { |
| 1521 | Lisp_Object scan; | 1521 | Lisp_Object scan; |
| 1522 | Lisp_Object term; | ||
| 1523 | Lisp_Object display; | 1522 | Lisp_Object display; |
| 1524 | 1523 | ||
| 1525 | /* FIXME: Code duplication. */ | 1524 | /* FIXME: Code duplication. */ |
| @@ -1557,15 +1556,7 @@ getenv_internal (var, varlen, value, valuelen, frame) | |||
| 1557 | frame = selected_frame; | 1556 | frame = selected_frame; |
| 1558 | } | 1557 | } |
| 1559 | 1558 | ||
| 1560 | /* For TERM and DISPLAY first try to get the values from the frame. */ | 1559 | /* For DISPLAY first try to get the values from the frame. */ |
| 1561 | term = get_frame_param (XFRAME (frame), Qterm_environment_variable); | ||
| 1562 | if (strcmp (var, "TERM") == 0) | ||
| 1563 | if (! NILP (term)) | ||
| 1564 | { | ||
| 1565 | *value = (char *) SDATA (term); | ||
| 1566 | *valuelen = SBYTES (term); | ||
| 1567 | return 1; | ||
| 1568 | } | ||
| 1569 | display = get_frame_param (XFRAME (frame), Qdisplay_environment_variable); | 1560 | display = get_frame_param (XFRAME (frame), Qdisplay_environment_variable); |
| 1570 | if (strcmp (var, "DISPLAY") == 0) | 1561 | if (strcmp (var, "DISPLAY") == 0) |
| 1571 | if (! NILP (display)) | 1562 | if (! NILP (display)) |