Mercurial > emacs
comparison src/callproc.c @ 83802:4b264c073ca8
(getenv_internal): Remove special case for $TERM.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 31 Aug 2007 07:33:10 +0000 |
parents | 6aa4d1effd67 |
children | 23e7b73bbc00 |
comparison
equal
deleted
inserted
replaced
83801:3ef554452c8a | 83802:4b264c073ca8 |
---|---|
1517 char **value; | 1517 char **value; |
1518 int *valuelen; | 1518 int *valuelen; |
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. */ |
1526 | 1525 |
1527 if (NILP (frame)) | 1526 if (NILP (frame)) |
1555 } | 1554 } |
1556 } | 1555 } |
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)) |
1572 { | 1563 { |
1573 *value = (char *) SDATA (display); | 1564 *value = (char *) SDATA (display); |