aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-08 21:17:30 +0000
committerGerd Moellmann2001-03-08 21:17:30 +0000
commit221dd3e77adae3ead2c59afa59d43c283a1c104a (patch)
treed317e20ef62c407aec915d883b52dda0c3b69dd9 /src
parent5de7c6f2360dddb513582c10a1d7d656a388e35f (diff)
downloademacs-221dd3e77adae3ead2c59afa59d43c283a1c104a.tar.gz
emacs-221dd3e77adae3ead2c59afa59d43c283a1c104a.zip
(handle_display_prop): Use it->w->buffer as object,
instead of nil.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 357b78cb8f1..34018585de6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12001-03-08 Gerd Moellmann <gerd@gnu.org> 12001-03-08 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (handle_display_prop): Use it->w->buffer as object,
4 instead of nil.
5
3 * xterm.c (note_mouse_highlight): Handle mouse-face and 6 * xterm.c (note_mouse_highlight): Handle mouse-face and
4 help-echo in strings. 7 help-echo in strings.
5 (x_y_to_hpos_vpos): Add parameter BUFFER_ONLY_P. 8 (x_y_to_hpos_vpos): Add parameter BUFFER_ONLY_P.
diff --git a/src/xdisp.c b/src/xdisp.c
index 3db708e15c9..23fc0a4b089 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2570,7 +2570,7 @@ handle_display_prop (it)
2570 } 2570 }
2571 else 2571 else
2572 { 2572 {
2573 object = Qnil; 2573 object = it->w->buffer;
2574 position = &it->current.pos; 2574 position = &it->current.pos;
2575 } 2575 }
2576 2576