aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2001-05-31 01:44:47 +0000
committerStefan Monnier2001-05-31 01:44:47 +0000
commitdb3a49a62e4dcc4e2113539f743b5108d3c1a13b (patch)
treef45d3df83afd7db70e9b4987fd69b4c8a0f53c2c /src
parent0d88b7d028166dc5c898614ef06bebfd68cc7c16 (diff)
downloademacs-db3a49a62e4dcc4e2113539f743b5108d3c1a13b.tar.gz
emacs-db3a49a62e4dcc4e2113539f743b5108d3c1a13b.zip
(copy_overlays): Make ENABLE_CHECKING happy.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog8
-rw-r--r--src/buffer.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 86932ba4e9f..a315cb37e47 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12001-05-30 Stefan Monnier <monnier@cs.yale.edu>
2
3 * buffer.c (copy_overlays): Make ENABLE_CHECKING happy.
4
12001-05-30 Gerd Moellmann <gerd@gnu.org> 52001-05-30 Gerd Moellmann <gerd@gnu.org>
2 6
3 * xfns.c (enum image_value_type): New enumerator 7 * xfns.c (enum image_value_type): New enumerator
@@ -24,7 +28,7 @@
24 28
252001-05-28 Gerd Moellmann <gerd@gnu.org> 292001-05-28 Gerd Moellmann <gerd@gnu.org>
26 30
27 * xmenu.c (xmenu_show) [!HAVE_MULTILINGUAL_MENU]: Don't overwrite 31 * xmenu.c (xmenu_show) [!HAVE_MULTILINGUAL_MENU]: Don't overwrite
28 an item's name with its key description in case the description 32 an item's name with its key description in case the description
29 is a multibyte string. 33 is a multibyte string.
30 34
@@ -56,7 +60,7 @@
56 60
57 * xfns.c (x_set_foreground_color): Change frame's cursor_pixel 61 * xfns.c (x_set_foreground_color): Change frame's cursor_pixel
58 only if it's equal to the former foreground pixel color. 62 only if it's equal to the former foreground pixel color.
59 (x_set_foreground_color, x_set_background_color) 63 (x_set_foreground_color, x_set_background_color)
60 (x_set_mouse_color, x_set_cursor_color): Cleaned up. 64 (x_set_mouse_color, x_set_cursor_color): Cleaned up.
61 65
622001-05-16 Dave Love <fx@gnu.org> 662001-05-16 Dave Love <fx@gnu.org>
diff --git a/src/buffer.c b/src/buffer.c
index bc41f2e3179..33d0ea55843 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -436,13 +436,13 @@ copy_overlays (b, list)
436 old_overlay = XCAR (list); 436 old_overlay = XCAR (list);
437 charpos = marker_position (OVERLAY_START (old_overlay)); 437 charpos = marker_position (OVERLAY_START (old_overlay));
438 start = Fmake_marker (); 438 start = Fmake_marker ();
439 Fset_marker (start, charpos, buffer); 439 Fset_marker (start, make_number (charpos), buffer);
440 XMARKER (start)->insertion_type 440 XMARKER (start)->insertion_type
441 = XMARKER (OVERLAY_START (old_overlay))->insertion_type; 441 = XMARKER (OVERLAY_START (old_overlay))->insertion_type;
442 442
443 charpos = marker_position (OVERLAY_END (old_overlay)); 443 charpos = marker_position (OVERLAY_END (old_overlay));
444 end = Fmake_marker (); 444 end = Fmake_marker ();
445 Fset_marker (end, charpos, buffer); 445 Fset_marker (end, make_number (charpos), buffer);
446 XMARKER (end)->insertion_type 446 XMARKER (end)->insertion_type
447 = XMARKER (OVERLAY_END (old_overlay))->insertion_type; 447 = XMARKER (OVERLAY_END (old_overlay))->insertion_type;
448 448