[Emacs-diffs] trunk r113473: Merge from emacs-24; up to r111388

[Glenn Morris]

------------------------------------------------------------
revno: 113473 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-07-20 12:20:33 -0700
message:
  Merge from emacs-24; up to r111388
modified:
  INSTALL                        install-20091113204419-o5vbwnq5f7feedwu-581
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/image-dired.el            
imagedired.el-20091113204419-o5vbwnq5f7feedwu-4485
  lisp/progmodes/gdb-mi.el       gdbmi.el-20100327132052-973a0aspo2g2bze8-1
  lisp/progmodes/sh-script.el    shscript.el-20091113204419-o5vbwnq5f7feedwu-727
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'INSTALL'
--- a/INSTALL   2013-05-29 13:21:17 +0000
+++ b/INSTALL   2013-07-20 19:20:33 +0000
@@ -70,24 +70,17 @@
      you, but there are no obvious errors, assume that `configure' did
      its job and proceed.
 
-  4. If you need to run the `configure' script more than once (e.g.,
-     with some non-default options), always clean the source
-     directories before running `configure' again:
-
-               make distclean
-               ./configure
-
-  5. Invoke the `make' program:
+  4. Invoke the `make' program:
 
                 make
 
-  6. If `make' succeeds, it will build an executable program `emacs'
+  5. If `make' succeeds, it will build an executable program `emacs'
      in the `src' directory.  You can try this program, to make sure
      it works:
 
                 src/emacs -Q
 
-  7. Assuming that the program `src/emacs' starts and displays its
+  6. Assuming that the program `src/emacs' starts and displays its
      opening screen, you can install the program and its auxiliary
      files into their installation directories:
 
@@ -101,6 +94,11 @@
 
   You can delete the entire build directory if you do not plan to
   build Emacs again, but it can be useful to keep for debugging.
+  If you want to build Emacs again with different configure options,
+  first clean the source directories:
+
+               make distclean
+               ./configure
 
   Note that the install automatically saves space by compressing
   (provided you have the `gzip' program) those installed Lisp source (.el)

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-20 15:41:38 +0000
+++ b/lisp/ChangeLog    2013-07-20 19:20:33 +0000
@@ -1,5 +1,18 @@
+2013-07-20  Glenn Morris  <address@hidden>
+
+       * image-dired.el (image-dired-track-original-file):
+       Avoid changing point of wrong window.  (Bug#14909)
+
+2013-07-20  Richard Copley  <address@hidden>  (tiny change)
+
+       * progmodes/gdb-mi.el (gdb-done-or-error):
+       Guard against "%" in gdb output.  (Bug#14127)
+
 2013-07-20  Andreas Schwab  <address@hidden>
 
+       * progmodes/sh-script.el (sh-read-variable): Remove interactive
+       spec.  (Bug#14826)
+
        * international/mule.el (coding-system-iso-2022-flags): Fix last
        change.
 

=== modified file 'lisp/image-dired.el'
--- a/lisp/image-dired.el       2013-06-13 05:10:48 +0000
+++ b/lisp/image-dired.el       2013-07-20 19:20:33 +0000
@@ -1039,15 +1039,15 @@
 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 ()

=== modified file 'lisp/progmodes/gdb-mi.el'
--- a/lisp/progmodes/gdb-mi.el  2013-07-12 18:17:17 +0000
+++ b/lisp/progmodes/gdb-mi.el  2013-07-20 19:20:33 +0000
@@ -2500,7 +2500,7 @@
        ;; 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)))

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2013-04-19 18:50:28 +0000
+++ b/lisp/progmodes/sh-script.el       2013-07-20 19:20:33 +0000
@@ -2401,7 +2401,6 @@
 
 (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)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-20 15:33:00 +0000
+++ b/src/ChangeLog     2013-07-20 19:20:33 +0000
@@ -1,3 +1,7 @@
+2013-07-20  Glenn Morris  <address@hidden>
+
+       * image.c (Fimage_flush): Fix doc typo.
+
 2013-07-20  Paul Eggert  <address@hidden>
 
        Fix array bounds violation when pty allocation fails.

=== modified file 'src/image.c'
--- a/src/image.c       2013-07-19 18:09:23 +0000
+++ b/src/image.c       2013-07-20 19:20:33 +0000
@@ -1569,7 +1569,7 @@
 
 DEFUN ("image-flush", Fimage_flush, Simage_flush,
        1, 2, 0,
-       doc: /* Fush the image with specification SPEC on frame FRAME.
+       doc: /* Flush the image with specification SPEC on frame FRAME.
 This removes the image from the Emacs image cache.  If SPEC specifies
 an image file, the next redisplay of this image will read from the
 current contents of that file.