commit 091450811b983a8cdd765c25eb347238d9a4c633 (HEAD, refs/remotes/origin/master)
Author: Martin Rudalics <rudalics@gmx.at>
Date:   Thu Dec 27 10:29:02 2018 +0100

    Fix last change of debug.el
    
    * lisp/emacs-lisp/debug.el (debug): In noninteractive calls do
    the buffer text truncation in the debugger buffer.

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 5c186f7019..3affa9cbdd 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -239,23 +239,23 @@ first will be printed into the backtrace buffer."
               (with-current-buffer debugger-buffer
                 (unless (derived-mode-p 'debugger-mode)
 	          (debugger-mode))
-	        (debugger-setup-buffer debugger-args))
-	      (when noninteractive
-		;; If the backtrace is long, save the beginning
-		;; and the end, but discard the middle.
-		(when (> (count-lines (point-min) (point-max))
-			 debugger-batch-max-lines)
+	        (debugger-setup-buffer debugger-args)
+	        (when noninteractive
+		  ;; If the backtrace is long, save the beginning
+		  ;; and the end, but discard the middle.
+		  (when (> (count-lines (point-min) (point-max))
+			   debugger-batch-max-lines)
+		    (goto-char (point-min))
+		    (forward-line (/ 2 debugger-batch-max-lines))
+		    (let ((middlestart (point)))
+		      (goto-char (point-max))
+		      (forward-line (- (/ 2 debugger-batch-max-lines)
+				       debugger-batch-max-lines))
+		      (delete-region middlestart (point)))
+		    (insert "...\n"))
 		  (goto-char (point-min))
-		  (forward-line (/ 2 debugger-batch-max-lines))
-		  (let ((middlestart (point)))
-		    (goto-char (point-max))
-		    (forward-line (- (/ 2 debugger-batch-max-lines)
-				     debugger-batch-max-lines))
-		    (delete-region middlestart (point)))
-		  (insert "...\n"))
-		(goto-char (point-min))
-		(message "%s" (buffer-string))
-		(kill-emacs -1))
+		  (message "%s" (buffer-string))
+		  (kill-emacs -1)))
 	      (pop-to-buffer
 	       debugger-buffer
 	       `((display-buffer-reuse-window
@@ -264,9 +264,9 @@ first will be printed into the backtrace buffer."
 		 . ((window-min-height . 10)
                     (window-height . fit-window-to-buffer)
 		    ,@(when (and (window-live-p debugger-previous-window)
-				(frame-visible-p
-				 (window-frame debugger-previous-window)))
-		       `((previous-window . ,debugger-previous-window))))))
+				 (frame-visible-p
+				  (window-frame debugger-previous-window)))
+		        `((previous-window . ,debugger-previous-window))))))
 	      (setq debugger-window (selected-window))
 	      (if (eq debugger-previous-window debugger-window)
 		  (when debugger-jumping-flag

commit 806ae9fc48f59751a8fce543be40ffe473f548bf
Author: Dmitry Gutov <dgutov@yandex.ru>
Date:   Thu Dec 27 01:40:05 2018 +0200

    Tone down diff-refine-removed and diff-refine-added as well
    
    * lisp/vc/diff-mode.el (diff-refine-removed, diff-refine-added):
    Change backgrounds in light backgrounds themes (bug#33567).

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index a4c0618c67..0291a13e19 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2026,7 +2026,7 @@ For use in `add-log-current-defun-function'."
   '((default
      :inherit diff-refine-changed)
     (((class color) (min-colors 88) (background light))
-     :background "#ffbbbb")
+     :background "#ffcccc")
     (((class color) (min-colors 88) (background dark))
      :background "#aa2222"))
   "Face used for removed characters shown by `diff-refine-hunk'."
@@ -2036,7 +2036,7 @@ For use in `add-log-current-defun-function'."
   '((default
      :inherit diff-refine-changed)
     (((class color) (min-colors 88) (background light))
-     :background "#aaffaa")
+     :background "#bbffbb")
     (((class color) (min-colors 88) (background dark))
      :background "#22aa22"))
   "Face used for added characters shown by `diff-refine-hunk'."