summaryrefslogtreecommitdiff
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-11-01 23:13:15 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-11-01 23:13:15 -0700
commit3616c8b26bfaf024d803371b85bee571cd6f061f (patch)
treebd7b5e6e3560b0496c144b13b44c1917cb9de8dc /src/ChangeLog
parent5b0d046d5b6a6743be6888d02352b878151e1d6c (diff)
parentdb22a3c27b078148c26a9f50afca5454a68d37d1 (diff)
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0b4da8f5e40..eb71bfc62ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-10-29 Paul Eggert <eggert@cs.ucla.edu>
+2011-11-02 Paul Eggert <eggert@cs.ucla.edu>
Fix integer width and related bugs (Bug#9874).
* alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -786,6 +786,20 @@
rather than rolling our own approximation.
(SCROLL_BAR_VEC_SIZE): Remove; not used.
+2011-11-01 Eli Zaretskii <eliz@gnu.org>
+
+ * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment.
+ Don't stop backward scan on the continuation glyph, even though
+ its CHARPOS is positive.
+ (mouse_face_from_buffer_pos, note_mouse_highlight): Rename
+ cover_string to disp_string.
+
+2011-11-01 Martin Rudalics <rudalics@gmx.at>
+
+ * window.c (temp_output_buffer_show): Don't use
+ Vtemp_buffer_show_specifiers.
+ (Vtemp_buffer_show_specifiers): Remove unused variable.
+
2011-10-30 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (try_cursor_movement): Make sure ROW isn't decremented