Merge from origin/emacs-24

bb7b23c5 In `debug' don't try using window on inaccessible frame (Bug#17170).

Conflicts:
	lisp/ChangeLog

lisp/ChangeLog

+2015-03-23  Martin Rudalics  <rudalics@gmx.at>
+
+	* emacs-lisp/debug.el (debug): Don't try using "previous" window
+	when its not live or on an invisible frame (Bug#17170).
+
 2015-03-23  Dmitry Gutov  <dgutov@yandex.ru>
 	* json.el (json-decode-char0): Delete this alias as well.

lisp/emacs-lisp/debug.el

@@ -192,8 +192,10 @@ first will be printed into the backtrace buffer."
 	       debugger-buffer
 	       `((display-buffer-reuse-window
 		  display-buffer-in-previous-window)
-		  . (,(when debugger-previous-window
-			`(previous-window . ,debugger-previous-window)))))
+		 . (,(when (and (window-live-p 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