diff options
| author | Gerd Moellmann | 2000-11-18 14:15:00 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-11-18 14:15:00 +0000 |
| commit | 1bfdbe4394d91f2645d60da16aced68246c74d06 (patch) | |
| tree | 7dc125cfff7d4f3be4c7039faf23152dc2ef110d /src | |
| parent | d392e9c567ca78f0a6331e3dd58b6bddfe1b8d4b (diff) | |
| download | emacs-1bfdbe4394d91f2645d60da16aced68246c74d06.tar.gz emacs-1bfdbe4394d91f2645d60da16aced68246c74d06.zip | |
(resize_mini_window): Temporarily change to the
mini-window's buffer if necessary.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/xdisp.c | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3e361b4a17d..0ac29af5c2d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2000-11-18 Gerd Moellmann <gerd@gnu.org> | 1 | 2000-11-18 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (resize_mini_window): Change to the mini-window's | ||
| 4 | buffer if necessary. | ||
| 5 | |||
| 3 | * xfns.c (Fx_show_tip): Use default y-offset of -10 so that | 6 | * xfns.c (Fx_show_tip): Use default y-offset of -10 so that |
| 4 | the tooltip obscures less text under it. | 7 | the tooltip obscures less text under it. |
| 5 | 8 | ||
diff --git a/src/xdisp.c b/src/xdisp.c index 9b4df8444d4..b7343c47caa 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -6128,6 +6128,13 @@ resize_mini_window (w, exact_p) | |||
| 6128 | int height, max_height; | 6128 | int height, max_height; |
| 6129 | int unit = CANON_Y_UNIT (f); | 6129 | int unit = CANON_Y_UNIT (f); |
| 6130 | struct text_pos start; | 6130 | struct text_pos start; |
| 6131 | struct buffer *old_current_buffer = NULL; | ||
| 6132 | |||
| 6133 | if (current_buffer != XBUFFER (w->buffer)) | ||
| 6134 | { | ||
| 6135 | old_current_buffer = current_buffer; | ||
| 6136 | set_buffer_internal (XBUFFER (w->buffer)); | ||
| 6137 | } | ||
| 6131 | 6138 | ||
| 6132 | init_iterator (&it, w, BEGV, BEGV_BYTE, NULL, DEFAULT_FACE_ID); | 6139 | init_iterator (&it, w, BEGV, BEGV_BYTE, NULL, DEFAULT_FACE_ID); |
| 6133 | 6140 | ||
| @@ -6215,6 +6222,9 @@ resize_mini_window (w, exact_p) | |||
| 6215 | window_height_changed_p = XFASTINT (w->height) != old_height; | 6222 | window_height_changed_p = XFASTINT (w->height) != old_height; |
| 6216 | } | 6223 | } |
| 6217 | } | 6224 | } |
| 6225 | |||
| 6226 | if (old_current_buffer) | ||
| 6227 | set_buffer_internal (old_current_buffer); | ||
| 6218 | } | 6228 | } |
| 6219 | 6229 | ||
| 6220 | return window_height_changed_p; | 6230 | return window_height_changed_p; |