diff options
| author | Martin Rudalics | 2008-10-09 08:26:33 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2008-10-09 08:26:33 +0000 |
| commit | 1bf7273525fbc3657d861630efe006dd8f66783a (patch) | |
| tree | f3dc781b3dee7eab7233919299cb195cf514fd45 /src | |
| parent | d5f98c51df0e3aac25ad8ec0458305523aa16ad3 (diff) | |
| download | emacs-1bf7273525fbc3657d861630efe006dd8f66783a.tar.gz emacs-1bf7273525fbc3657d861630efe006dd8f66783a.zip | |
(Fraise_frame): On text-only terminals select frame in
order to make it visible. (Bug#1061)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/frame.c | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 23aa0242bc6..4b0daf5b862 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-10-09 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * frame.c (Fraise_frame): On text-only terminals select frame in | ||
| 4 | order to make it visible. (Bug#1061) | ||
| 5 | |||
| 1 | 2008-10-08 Chong Yidong <cyd@stupidchicken.com> | 6 | 2008-10-08 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * fontset.c (fontset_find_font): Check frame validity. | 8 | * fontset.c (fontset_find_font): Check frame validity. |
diff --git a/src/frame.c b/src/frame.c index 35b6417a71c..92edcc06206 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -2004,7 +2004,7 @@ DEFUN ("raise-frame", Fraise_frame, Sraise_frame, 0, 1, "", | |||
| 2004 | If FRAME is invisible or iconified, make it visible. | 2004 | If FRAME is invisible or iconified, make it visible. |
| 2005 | If you don't specify a frame, the selected frame is used. | 2005 | If you don't specify a frame, the selected frame is used. |
| 2006 | If Emacs is displaying on an ordinary terminal or some other device which | 2006 | If Emacs is displaying on an ordinary terminal or some other device which |
| 2007 | doesn't support multiple overlapping frames, this function does nothing. */) | 2007 | doesn't support multiple overlapping frames, this function selects FRAME. */) |
| 2008 | (frame) | 2008 | (frame) |
| 2009 | Lisp_Object frame; | 2009 | Lisp_Object frame; |
| 2010 | { | 2010 | { |
| @@ -2016,8 +2016,12 @@ doesn't support multiple overlapping frames, this function does nothing. */) | |||
| 2016 | 2016 | ||
| 2017 | f = XFRAME (frame); | 2017 | f = XFRAME (frame); |
| 2018 | 2018 | ||
| 2019 | /* Do like the documentation says. */ | 2019 | if (FRAME_TERMCAP_P (f)) |
| 2020 | Fmake_frame_visible (frame); | 2020 | /* On a text-only terminal select FRAME. */ |
| 2021 | Fselect_frame (frame); | ||
| 2022 | else | ||
| 2023 | /* Do like the documentation says. */ | ||
| 2024 | Fmake_frame_visible (frame); | ||
| 2021 | 2025 | ||
| 2022 | if (FRAME_TERMINAL (f)->frame_raise_lower_hook) | 2026 | if (FRAME_TERMINAL (f)->frame_raise_lower_hook) |
| 2023 | (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 1); | 2027 | (*FRAME_TERMINAL (f)->frame_raise_lower_hook) (f, 1); |
| @@ -3413,7 +3417,7 @@ x_set_font_backend (f, new_value, old_value) | |||
| 3413 | && !CONSP (new_value)) | 3417 | && !CONSP (new_value)) |
| 3414 | { | 3418 | { |
| 3415 | char *p0, *p1; | 3419 | char *p0, *p1; |
| 3416 | 3420 | ||
| 3417 | CHECK_STRING (new_value); | 3421 | CHECK_STRING (new_value); |
| 3418 | p0 = p1 = SDATA (new_value); | 3422 | p0 = p1 = SDATA (new_value); |
| 3419 | new_value = Qnil; | 3423 | new_value = Qnil; |