1 files changed, 7 insertions, 0 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index d67e4f42d30..2934153eb98 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -686,6 +686,13 @@ Otherwise, that variable should be nil."
       (setq arg (1+ arg)))
     (select-frame-set-input-focus frame)))
 
+(defun iconify-or-deiconify-frame ()
+  "Iconify the selected frame, or deiconify if it's currently an icon."
+  (interactive)
+  (if (eq (cdr (assq 'visibility (frame-parameters))) t)
+      (iconify-frame)
+    (make-frame-visible)))
+
 (defun make-frame-names-alist ()
   (let* ((current-frame (selected-frame))
          (falist