diff options
| author | Martin Rudalics | 2017-11-18 19:19:32 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2017-11-18 19:19:32 +0100 |
| commit | 6e6bf60eab1e921605064e3d39ea080639f8e0f6 (patch) | |
| tree | 974eeb7407a9a9710ded9c5774b09de8d9462eca /src | |
| parent | e9dd580cc8b3134eb82d758efb070a3ab8dd3e9a (diff) | |
| download | emacs-6e6bf60eab1e921605064e3d39ea080639f8e0f6.tar.gz emacs-6e6bf60eab1e921605064e3d39ea080639f8e0f6.zip | |
Don't let delete_frame select a tooltip frame (Bug#27647)
* src/frame.c (delete_frame): Don't select a tooltip
frame. (Bug#27647)
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/frame.c b/src/frame.c index 2b32751c0d3..aacb27ec790 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -1920,6 +1920,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) | |||
| 1920 | See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025. */ | 1920 | See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=15025. */ |
| 1921 | FOR_EACH_FRAME (tail, frame1) | 1921 | FOR_EACH_FRAME (tail, frame1) |
| 1922 | if (!EQ (frame, frame1) | 1922 | if (!EQ (frame, frame1) |
| 1923 | && NILP (Fframe_parameter (frame1, Qtooltip)) | ||
| 1923 | && (FRAME_TERMINAL (XFRAME (frame)) | 1924 | && (FRAME_TERMINAL (XFRAME (frame)) |
| 1924 | == FRAME_TERMINAL (XFRAME (frame1))) | 1925 | == FRAME_TERMINAL (XFRAME (frame1))) |
| 1925 | && FRAME_VISIBLE_P (XFRAME (frame1))) | 1926 | && FRAME_VISIBLE_P (XFRAME (frame1))) |
| @@ -1930,7 +1931,9 @@ delete_frame (Lisp_Object frame, Lisp_Object force) | |||
| 1930 | { | 1931 | { |
| 1931 | FOR_EACH_FRAME (tail, frame1) | 1932 | FOR_EACH_FRAME (tail, frame1) |
| 1932 | { | 1933 | { |
| 1933 | if (! EQ (frame, frame1) && FRAME_LIVE_P (XFRAME (frame1))) | 1934 | if (!EQ (frame, frame1) |
| 1935 | && FRAME_LIVE_P (XFRAME (frame1)) | ||
| 1936 | && NILP (Fframe_parameter (frame1, Qtooltip))) | ||
| 1934 | { | 1937 | { |
| 1935 | /* Do not change a text terminal's top-frame. */ | 1938 | /* Do not change a text terminal's top-frame. */ |
| 1936 | struct frame *f1 = XFRAME (frame1); | 1939 | struct frame *f1 = XFRAME (frame1); |