diff options
| author | Juanma Barranquero | 2008-02-17 21:56:39 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-02-17 21:56:39 +0000 |
| commit | 5b09339783de44336afe8fabf7ecfcfb114f43a0 (patch) | |
| tree | 91be4d88eca61f80b85aea2d75c1cea8add01159 /src | |
| parent | cc469ff44c4aa6a59f72ea6f984f36646e77166d (diff) | |
| download | emacs-5b09339783de44336afe8fabf7ecfcfb114f43a0.tar.gz emacs-5b09339783de44336afe8fabf7ecfcfb114f43a0.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/xdisp.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 920862d8298..cb4967c705a 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -2536,7 +2536,7 @@ init_iterator (it, w, charpos, bytepos, row, base_face_id) | |||
| 2536 | XSETWINDOW (it->window, w); | 2536 | XSETWINDOW (it->window, w); |
| 2537 | it->w = w; | 2537 | it->w = w; |
| 2538 | it->f = XFRAME (w->frame); | 2538 | it->f = XFRAME (w->frame); |
| 2539 | 2539 | ||
| 2540 | /* Extra space between lines (on window systems only). */ | 2540 | /* Extra space between lines (on window systems only). */ |
| 2541 | if (base_face_id == DEFAULT_FACE_ID | 2541 | if (base_face_id == DEFAULT_FACE_ID |
| 2542 | && FRAME_WINDOW_P (it->f)) | 2542 | && FRAME_WINDOW_P (it->f)) |
| @@ -5997,7 +5997,7 @@ get_next_display_element (it) | |||
| 5997 | int pos = (it->s ? -1 | 5997 | int pos = (it->s ? -1 |
| 5998 | : STRINGP (it->string) ? IT_STRING_CHARPOS (*it) | 5998 | : STRINGP (it->string) ? IT_STRING_CHARPOS (*it) |
| 5999 | : IT_CHARPOS (*it)); | 5999 | : IT_CHARPOS (*it)); |
| 6000 | 6000 | ||
| 6001 | it->face_id = FACE_FOR_CHAR (it->f, face, it->c, pos, it->string); | 6001 | it->face_id = FACE_FOR_CHAR (it->f, face, it->c, pos, it->string); |
| 6002 | } | 6002 | } |
| 6003 | 6003 | ||
| @@ -8473,7 +8473,7 @@ resize_mini_window_1 (a1, exactly, a3, a4) | |||
| 8473 | } | 8473 | } |
| 8474 | 8474 | ||
| 8475 | 8475 | ||
| 8476 | /* Resize mini-window W to fit the size of its contents. EXACT:P | 8476 | /* Resize mini-window W to fit the size of its contents. EXACT_P |
| 8477 | means size the window exactly to the size needed. Otherwise, it's | 8477 | means size the window exactly to the size needed. Otherwise, it's |
| 8478 | only enlarged until W's buffer is empty. | 8478 | only enlarged until W's buffer is empty. |
| 8479 | 8479 | ||
| @@ -8915,11 +8915,11 @@ clear_garbaged_frames () | |||
| 8915 | { | 8915 | { |
| 8916 | Lisp_Object tail, frame; | 8916 | Lisp_Object tail, frame; |
| 8917 | int changed_count = 0; | 8917 | int changed_count = 0; |
| 8918 | 8918 | ||
| 8919 | FOR_EACH_FRAME (tail, frame) | 8919 | FOR_EACH_FRAME (tail, frame) |
| 8920 | { | 8920 | { |
| 8921 | struct frame *f = XFRAME (frame); | 8921 | struct frame *f = XFRAME (frame); |
| 8922 | 8922 | ||
| 8923 | if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) | 8923 | if (FRAME_VISIBLE_P (f) && FRAME_GARBAGED_P (f)) |
| 8924 | { | 8924 | { |
| 8925 | if (f->resized_p) | 8925 | if (f->resized_p) |
| @@ -8933,7 +8933,7 @@ clear_garbaged_frames () | |||
| 8933 | f->resized_p = 0; | 8933 | f->resized_p = 0; |
| 8934 | } | 8934 | } |
| 8935 | } | 8935 | } |
| 8936 | 8936 | ||
| 8937 | frame_garbaged = 0; | 8937 | frame_garbaged = 0; |
| 8938 | if (changed_count) | 8938 | if (changed_count) |
| 8939 | ++windows_or_buffers_changed; | 8939 | ++windows_or_buffers_changed; |
| @@ -11214,7 +11214,7 @@ redisplay_internal (preserve_echo_area) | |||
| 11214 | } | 11214 | } |
| 11215 | } | 11215 | } |
| 11216 | 11216 | ||
| 11217 | 11217 | ||
| 11218 | /* Notice any pending interrupt request to change frame size. */ | 11218 | /* Notice any pending interrupt request to change frame size. */ |
| 11219 | do_pending_window_change (1); | 11219 | do_pending_window_change (1); |
| 11220 | 11220 | ||
| @@ -21329,7 +21329,7 @@ x_produce_glyphs (it) | |||
| 21329 | + grefx * (rightmost - leftmost) / 2 | 21329 | + grefx * (rightmost - leftmost) / 2 |
| 21330 | - nrefx * width / 2 | 21330 | - nrefx * width / 2 |
| 21331 | + xoff); | 21331 | + xoff); |
| 21332 | 21332 | ||
| 21333 | btm = ((grefy == 0 ? highest | 21333 | btm = ((grefy == 0 ? highest |
| 21334 | : grefy == 1 ? 0 | 21334 | : grefy == 1 ? 0 |
| 21335 | : grefy == 2 ? lowest | 21335 | : grefy == 2 ? lowest |
| @@ -23922,7 +23922,7 @@ x_draw_vertical_border (w) | |||
| 23922 | struct window *w; | 23922 | struct window *w; |
| 23923 | { | 23923 | { |
| 23924 | struct frame *f = XFRAME (WINDOW_FRAME (w)); | 23924 | struct frame *f = XFRAME (WINDOW_FRAME (w)); |
| 23925 | 23925 | ||
| 23926 | /* We could do better, if we knew what type of scroll-bar the adjacent | 23926 | /* We could do better, if we knew what type of scroll-bar the adjacent |
| 23927 | windows (on either side) have... But we don't :-( | 23927 | windows (on either side) have... But we don't :-( |
| 23928 | However, I think this works ok. ++KFS 2003-04-25 */ | 23928 | However, I think this works ok. ++KFS 2003-04-25 */ |