New control structure: with-selected-frame.

lisp/subr.el (with-selected-frame): New macro.
lisp/font-lock.el (lisp-font-lock-keywords-2): Add with-selected-frame.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-168

2 files changed, 13 insertions, 1 deletions

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 044c414d84e..96caba543c7 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1893,7 +1893,7 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
                     "with-current-buffer" "with-electric-help"
                     "with-local-quit" "with-no-warnings"
                     "with-output-to-string" "with-output-to-temp-buffer"
-                    "with-selected-window" "with-syntax-table"
+                    "with-selected-window" "with-selected-frame" "with-syntax-table"
                     "with-temp-buffer" "with-temp-file" "with-temp-message"
                     "with-timeout" "with-timeout-handler") t)
              "\\>")
diff --git a/lisp/subr.el b/lisp/subr.el
index 5302558d834..8559de28746 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1812,6 +1812,18 @@ See also `with-temp-buffer'."
            ;; This is where the code differs from save-selected-window.
            (select-window save-selected-window-window 'norecord)))))
 
+(defmacro with-selected-frame (frame &rest body)
+  "Execute the forms in BODY with FRAME as the selected frame.
+The value returned is the value of the last form in BODY.
+See also `with-temp-buffer'."
+  (declare (indent 1) (debug t))
+  `(let ((save-selected-frame (selected-frame)))
+     (unwind-protect
+         (progn (select-frame ,frame)
+                ,@body)
+       (if (frame-live-p save-selected-frame)
+           (select-frame save-selected-frame)))))
+
 (defmacro with-temp-file (file &rest body)
   "Create a new buffer, evaluate BODY there, and write the buffer to FILE.
 The value returned is the value of the last form in BODY.