merge from trunk

4 files changed, 65 insertions, 44 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bcab8de10a4..9119b34d52c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (debugger-setup-buffer): Put point on the
+        previous line (bug#15101).
+        (debugger-eval-expression, debugger-record-expression):
+        Use read--expression (bug#15102).
+
 2013-08-15  Michael Albinus  <michael.albinus@gmx.de>
 
         Remove byte compiler warnings, visible when compiling with
@@ -20,8 +27,8 @@
         (tramp-flush-connection-property, tramp-list-connections)
         (tramp-parse-connection-properties): Prefix unused arguments with "_".
 
-        * net/tramp-compat.el (tramp-compat-make-temp-file): Rename
-        FILENAME to F.
+        * net/tramp-compat.el (tramp-compat-make-temp-file):
+        Rename FILENAME to F.
 
         * net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch)
         (tramp-gvfs-handle-write-region, tramp-bluez-parse-device-names)
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index aee48eef668..709a094e73b 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -288,33 +288,41 @@ That buffer should be current already."
   (insert "Debugger entered")
   ;; lambda is for debug-on-call when a function call is next.
   ;; debug is for debug-on-entry function called.
-  (pcase (car args)
-    ((or `lambda `debug)
-     (insert "--entering a function:\n"))
-    ;; Exiting a function.
-    (`exit
-     (insert "--returning value: ")
-     (setq debugger-value (nth 1 args))
-     (prin1 debugger-value (current-buffer))
-     (insert ?\n)
-     (delete-char 1)
-     (insert ? )
-     (beginning-of-line))
-    ;; Debugger entered for an error.
-    (`error
-     (insert "--Lisp error: ")
-     (prin1 (nth 1 args) (current-buffer))
-     (insert ?\n))
-    ;; debug-on-call, when the next thing is an eval.
-    (`t
-     (insert "--beginning evaluation of function call form:\n"))
-    ;; User calls debug directly.
-    (_
-     (insert ": ")
-     (prin1 (if (eq (car args) 'nil)
-                (cdr args) args)
-            (current-buffer))
-     (insert ?\n)))
+  (let ((pos (point)))
+    (pcase (car args)
+      ((or `lambda `debug)
+       (insert "--entering a function:\n")
+       (setq pos (1- (point))))
+      ;; Exiting a function.
+      (`exit
+       (insert "--returning value: ")
+       (setq pos (point))
+       (setq debugger-value (nth 1 args))
+       (prin1 debugger-value (current-buffer))
+       (insert ?\n)
+       (delete-char 1)
+       (insert ? )
+       (beginning-of-line))
+      ;; Debugger entered for an error.
+      (`error
+       (insert "--Lisp error: ")
+       (setq pos (point))
+       (prin1 (nth 1 args) (current-buffer))
+       (insert ?\n))
+      ;; debug-on-call, when the next thing is an eval.
+      (`t
+       (insert "--beginning evaluation of function call form:\n")
+       (setq pos (1- (point))))
+      ;; User calls debug directly.
+      (_
+       (insert ": ")
+       (setq pos (point))
+       (prin1 (if (eq (car args) 'nil)
+                  (cdr args) args)
+              (current-buffer))
+       (insert ?\n)))
+    ;; Place point on "stack frame 0" (bug#15101).
+    (goto-char pos))
   ;; After any frame that uses eval-buffer,
   ;; insert a line that states the buffer position it's reading at.
   (save-excursion
@@ -533,16 +541,15 @@ Applies to the frame whose line point is on in the backtrace."
         (progn ,@body)
       (setq debugger-outer-match-data (match-data)))))
 
-(defun debugger-eval-expression (exp)
+(defun debugger-eval-expression (exp &optional nframe)
   "Eval an expression, in an environment like that outside the debugger.
 The environment used is the one when entering the activation frame at point."
   (interactive
-   (list (read-from-minibuffer "Eval: "
-                               nil read-expression-map t
-                               'read-expression-history)))
-  (let ((nframe (condition-case nil (1+ (debugger-frame-number 'skip-base))
-                  (error 0))) ;; If on first line.
-        (base (if (eq 'debug--implement-debug-on-entry
+   (list (read--expression "Eval in stack frame: ")))
+  (let ((nframe (or nframe
+                    (condition-case nil (1+ (debugger-frame-number 'skip-base))
+                      (error 0)))) ;; If on first line.
+         (base (if (eq 'debug--implement-debug-on-entry
                       (cadr (backtrace-frame 1 'debug)))
                   'debug--implement-debug-on-entry 'debug)))
     (debugger-env-macro
@@ -651,11 +658,7 @@ Complete list of commands:
 (defun debugger-record-expression  (exp)
   "Display a variable's value and record it in `*Backtrace-record*' buffer."
   (interactive
-   (list (read-from-minibuffer
-          "Record Eval: "
-          nil
-          read-expression-map t
-          'read-expression-history)))
+   (list (read--expression "Record Eval: ")))
   (let* ((buffer (get-buffer-create debugger-record-buffer))
          (standard-output buffer))
     (princ (format "Debugger Eval (%s): " exp))
diff --git a/src/ChangeLog b/src/ChangeLog
index c12b32ebc71..028c33848a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * image.c (imagemagick_compute_animated_image): Respect the GIF
+        disposal methods.
+
 2013-08-15  Ken Brown  <kbrown@cornell.edu>
 
         * emacs.c (main): Update comment about G_SLICE_ALWAYS_MALLOC.
diff --git a/src/image.c b/src/image.c
index 3cab72edf74..bc9f9ab123a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7887,17 +7887,20 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
   else
     composite_wand = animation_cache;
 
-  for (i = max (1, animation_index); i <= ino; i++)
+  for (i = max (1, animation_index + 1); i <= ino; i++)
     {
       MagickWand *sub_wand;
       PixelIterator *source_iterator, *dest_iterator;
       PixelWand **source, **dest;
       size_t source_width, dest_width;
       MagickPixelPacket pixel;
+      DisposeType dispose;
 
       MagickSetIteratorIndex (super_wand, i);
       sub_wand = MagickGetImage (super_wand);
 
+      dispose = MagickGetImageDispose (sub_wand);
+
       source_iterator = NewPixelIterator (sub_wand);
       if (! source_iterator)
         {
@@ -7926,8 +7929,11 @@ imagemagick_compute_animated_image (MagickWand *super_wand, int ino)
           dest = PixelGetNextIteratorRow (dest_iterator, &dest_width);
           for (x = 0; x < source_width; x++)
             {
-              /* Copy over non-transparent pixels. */
-              if (PixelGetAlpha (source[x]))
+              /* Normally we only copy over non-transparent pixels,
+                 but if the disposal method is "Background", then we
+                 copy over all pixels.  */
+              if (dispose == BackgroundDispose ||
+                  PixelGetAlpha (source[x]))
                 {
                   PixelGetMagickColor (source[x], &pixel);
                   PixelSetMagickColor (dest[x], &pixel);