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

4 files changed, 18 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b47dbacd5a8..a259c044020 100644
--- 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.
 
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index afb940fe337..b196bf77671 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -1039,15 +1039,15 @@ With prefix argument ARG, remove tag from file at point."
 See documentation for `image-dired-toggle-movement-tracking'.
 Interactive use only useful if `image-dired-track-movement' is nil."
   (interactive)
-  (let ((old-buf (current-buffer))
+  (let* ((old-buf (current-buffer))
         (dired-buf (image-dired-associated-dired-buffer))
-        (file-name (image-dired-original-file-name)))
+         (file-name (image-dired-original-file-name))
+         (window (image-dired-get-buffer-window dired-buf)))
     (when (and (buffer-live-p dired-buf) file-name)
       (set-buffer dired-buf)
       (if (not (dired-goto-file file-name))
           (message "Could not track file")
-        (set-window-point
-         (image-dired-get-buffer-window dired-buf) (point)))
+        (if window (set-window-point window (point))))
       (set-buffer old-buf))))
 
 (defun image-dired-toggle-movement-tracking ()
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 10472ec5815..96215b9bf1a 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2500,7 +2500,7 @@ current thread and update GDB buffers."
         ;; MI error - send to minibuffer
         (when (eq type 'error)
           ;; Skip "msg=" from `output-field'
-          (message (read (substring output-field 4)))
+          (message "%s" (read (substring output-field 4)))
           ;; Don't send to the console twice.  (If it is a console error
           ;; it is also in the console stream.)
           (setq output-field nil)))
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 07e9bb85c4e..29020d95226 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2401,7 +2401,6 @@ which in this buffer is currently %s.
 
 (defun sh-read-variable (var)
   "Read a new value for indentation variable VAR."
-  (interactive "*variable? ") ;; to test
   (let ((minibuffer-help-form `(sh-help-string-for-variable
                                 (quote ,var)))
         val)