diff options
| author | Gerd Moellmann | 1999-12-28 12:13:02 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 1999-12-28 12:13:02 +0000 |
| commit | 481b505472c397d389a75e4c4e0247b724cde746 (patch) | |
| tree | ac625d56ae438a12d0d47b15635c8572a7704e2a /src | |
| parent | 9d60f77200a72fa9367704b061ebba92b04b69c1 (diff) | |
| download | emacs-481b505472c397d389a75e4c4e0247b724cde746.tar.gz emacs-481b505472c397d389a75e4c4e0247b724cde746.zip | |
(modify_overlay): Always compute unchanged info.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 17 | ||||
| -rw-r--r-- | src/buffer.c | 4 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index afa53ef651a..22875eaf75a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 1999-12-28 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (try_window_id): Compute BEG_UNCHANGED and END_UNCHANGED | ||
| 4 | if MODIFF > 1. | ||
| 5 | |||
| 6 | * buffer.c (modify_overlay): Always compute unchanged info. | ||
| 7 | |||
| 1 | 1999-12-27 Kenichi Handa <handa@etl.go.jp> | 8 | 1999-12-27 Kenichi Handa <handa@etl.go.jp> |
| 2 | 9 | ||
| 3 | * dispextern.h (FACE_FROM_ID): Cast the arg ID to `unsigned'. | 10 | * dispextern.h (FACE_FROM_ID): Cast the arg ID to `unsigned'. |
| @@ -9,10 +16,10 @@ | |||
| 9 | * lisp.h (GLYPH): Defined as `int', not `unsigned int'. Now the | 16 | * lisp.h (GLYPH): Defined as `int', not `unsigned int'. Now the |
| 10 | lowest 8 bits are single byte character code, the bits above are | 17 | lowest 8 bits are single byte character code, the bits above are |
| 11 | face ID. | 18 | face ID. |
| 12 | (GLYPH_MASK_FACE) (GLYPH_MASK_CHAR): Adjusted for the change | 19 | (GLYPH_MASK_FACE, GLYPH_MASK_CHAR): Adjusted for the change |
| 13 | above. | 20 | above. |
| 14 | (FAST_MAKE_GLYPH) (FSST_GLYPH_FACE): Likewise. | 21 | (FAST_MAKE_GLYPH, FSST_GLYPH_FACE): Likewise. |
| 15 | (GLYPH_MASK_REV_DIR) (GLYPH_MASK_PADDING): Macros deleted. | 22 | (GLYPH_MASK_REV_DIR, GLYPH_MASK_PADDING): Macros deleted. |
| 16 | 23 | ||
| 17 | * charset.h (CHAR_BYTES): Use ((1 << CHARACTERBITS) - 1) instead | 24 | * charset.h (CHAR_BYTES): Use ((1 << CHARACTERBITS) - 1) instead |
| 18 | of GLYPH_MASK_CHAR. | 25 | of GLYPH_MASK_CHAR. |
| @@ -29,7 +36,7 @@ | |||
| 29 | (GLYPH_FROM_CHAR_GLYPH): Likewise. Always return -1 for multibyte | 36 | (GLYPH_FROM_CHAR_GLYPH): Likewise. Always return -1 for multibyte |
| 30 | characters. | 37 | characters. |
| 31 | 38 | ||
| 32 | * dispnew.c (line_hash_code) (direct_output_for_insert): Adjusted | 39 | * dispnew.c (line_hash_code, direct_output_for_insert): Adjusted |
| 33 | for the change of struct glyph. | 40 | for the change of struct glyph. |
| 34 | (line_draw_cost): Adjusted for the change of | 41 | (line_draw_cost): Adjusted for the change of |
| 35 | GLYPH_FROM_CHAR_GLYPH. | 42 | GLYPH_FROM_CHAR_GLYPH. |
| @@ -37,7 +44,7 @@ | |||
| 37 | 44 | ||
| 38 | * term.c (encode_terminal_code): Adjusted for the change of struct | 45 | * term.c (encode_terminal_code): Adjusted for the change of struct |
| 39 | glyph and GLYPH_FROM_CHAR_GLYPH. | 46 | glyph and GLYPH_FROM_CHAR_GLYPH. |
| 40 | (write_glyphs) (insert_glyphs) (append_glyph): Adjusted for the | 47 | (write_glyphs, insert_glyphs, append_glyph): Adjusted for the |
| 41 | change of struct glyph. | 48 | change of struct glyph. |
| 42 | 49 | ||
| 43 | * xdisp.c: All codes adjusted for the change of struct glyph. | 50 | * xdisp.c: All codes adjusted for the change of struct glyph. |
diff --git a/src/buffer.c b/src/buffer.c index 47d15e9fcf1..871a152484e 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -3088,6 +3088,8 @@ modify_overlay (buf, start, end) | |||
| 3088 | start = end; end = temp; | 3088 | start = end; end = temp; |
| 3089 | } | 3089 | } |
| 3090 | 3090 | ||
| 3091 | BUF_COMPUTE_UNCHANGED (buf, start, end); | ||
| 3092 | |||
| 3091 | /* If this is a buffer not in the selected window, | 3093 | /* If this is a buffer not in the selected window, |
| 3092 | we must do other windows. */ | 3094 | we must do other windows. */ |
| 3093 | if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) | 3095 | if (buf != XBUFFER (XWINDOW (selected_window)->buffer)) |
| @@ -3095,8 +3097,6 @@ modify_overlay (buf, start, end) | |||
| 3095 | /* If multiple windows show this buffer, we must do other windows. */ | 3097 | /* If multiple windows show this buffer, we must do other windows. */ |
| 3096 | else if (buffer_shared > 1) | 3098 | else if (buffer_shared > 1) |
| 3097 | windows_or_buffers_changed = 1; | 3099 | windows_or_buffers_changed = 1; |
| 3098 | else | ||
| 3099 | BUF_COMPUTE_UNCHANGED (buf, start, end); | ||
| 3100 | 3100 | ||
| 3101 | ++BUF_OVERLAY_MODIFF (buf); | 3101 | ++BUF_OVERLAY_MODIFF (buf); |
| 3102 | } | 3102 | } |