merge from trunk

[gnu-emacs] / src / ChangeLog.11

diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 1f444b9292cdee9d3b1dfce76ebe9ac6c40cd786..a67dd2cc458640b98c4a1112bc3b2189f27734f2 100644 (file)
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -14366,7 +14366,7 @@
 2009-01-10  Chong Yidong  <cyd@stupidchicken.com>
 
        * xdisp.c (pos_visible_p): When iterator stops on the last glyph
-       of a display vector, backtrack.
+       of a display vector, backtrack.  (Bug#1810)
        (try_window_reusing_current_matrix): Check glyph type before
        referencing charpos member.
 
@@ -31383,7 +31383,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2007-2012  Free Software Foundation, Inc.
+  Copyright (C) 2007-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.