(suspend-frame): Call `iconify-or-deiconify-frame' also on w32 frames.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d529e3a6ea6e5145ba8e2dc334039954496acaeb..ef920fda5bb70f3fe0a82395c54174234f85721c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
+2007-09-21  Juanma Barranquero  <lekktu@gmail.com>
+
+       * frame.el (suspend-frame): Call `iconify-or-deiconify-frame' also
+       on w32 frames.
+
 2007-09-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * startup.el (normal-top-level): Remove DISPLAY from
-       process-environment to let it be computed dynamically in callproc.c
+       process-environment to let it be computed dynamically in callproc.c.
 
        * frame.el (frame-initialize, make-frame):
        * faces.el (tty-set-up-initial-frame-faces):
@@ -258,7 +263,7 @@
        server-process-filter.
        (server-execute-continuation): New functions.
        (server-process-filter): Restructure so that all arguments are analysed
-       first and then acted upon in a subsequent stage  This way
+       first and then acted upon in a subsequent stage.  This way
        server-goto-toplevel can be executed later, when we know if
        it's necessary.
        Remove the "-version" and "-version-good" support.

diff --git a/lisp/frame.el b/lisp/frame.el
index 3e7eb9653c06c031002e12cf6a5a0d82c114ae85..27dc4be1aa6af6c1941a1022ef05b610f068998d 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -876,7 +876,7 @@ Calls `suspend-emacs' if invoked from the controlling tty device,
   (interactive)
   (let ((type (framep (selected-frame))))
     (cond
-     ((eq type 'x) (iconify-or-deiconify-frame))
+     ((memq type '(x w32)) (iconify-or-deiconify-frame))
      ((eq type t)
       (if (controlling-tty-p)
          (suspend-emacs)