Merge from emacs-24; up to 2012-12-31T11:35:13Z!rudalics@gmx.at

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b47dbacd5a843d788e701ec54caa24a59978e165..a259c04402057c285e20ed4990c642d46719768f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,18 @@
+2013-07-20  Glenn Morris  <rgm@gnu.org>
+
+       * image-dired.el (image-dired-track-original-file):
+       Avoid changing point of wrong window.  (Bug#14909)
+
+2013-07-20  Richard Copley  <rcopley@gmail.com>  (tiny change)
+
+       * progmodes/gdb-mi.el (gdb-done-or-error):
+       Guard against "%" in gdb output.  (Bug#14127)
+
 2013-07-20  Andreas Schwab  <schwab@linux-m68k.org>
 
+       * progmodes/sh-script.el (sh-read-variable): Remove interactive
+       spec.  (Bug#14826)
+
        * international/mule.el (coding-system-iso-2022-flags): Fix last
        change.