diff options
| author | Juanma Barranquero | 2007-09-21 11:08:00 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-09-21 11:08:00 +0000 |
| commit | 2171e172b8c1cf5ce4d4bc6cb123050352623d00 (patch) | |
| tree | 9047d279bccbde80147621b06e9347ef8c00906a | |
| parent | def7fa3452d27173177227a674f02a949c3d7973 (diff) | |
| download | emacs-2171e172b8c1cf5ce4d4bc6cb123050352623d00.tar.gz emacs-2171e172b8c1cf5ce4d4bc6cb123050352623d00.zip | |
(suspend-frame): Call `iconify-or-deiconify-frame' also on w32 frames.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/frame.el | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d529e3a6ea6..ef920fda5bb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,7 +1,12 @@ | |||
| 1 | 2007-09-21 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * frame.el (suspend-frame): Call `iconify-or-deiconify-frame' also | ||
| 4 | on w32 frames. | ||
| 5 | |||
| 1 | 2007-09-21 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2007-09-21 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * startup.el (normal-top-level): Remove DISPLAY from | 8 | * startup.el (normal-top-level): Remove DISPLAY from |
| 4 | process-environment to let it be computed dynamically in callproc.c | 9 | process-environment to let it be computed dynamically in callproc.c. |
| 5 | 10 | ||
| 6 | * frame.el (frame-initialize, make-frame): | 11 | * frame.el (frame-initialize, make-frame): |
| 7 | * faces.el (tty-set-up-initial-frame-faces): | 12 | * faces.el (tty-set-up-initial-frame-faces): |
| @@ -258,7 +263,7 @@ | |||
| 258 | server-process-filter. | 263 | server-process-filter. |
| 259 | (server-execute-continuation): New functions. | 264 | (server-execute-continuation): New functions. |
| 260 | (server-process-filter): Restructure so that all arguments are analysed | 265 | (server-process-filter): Restructure so that all arguments are analysed |
| 261 | first and then acted upon in a subsequent stage This way | 266 | first and then acted upon in a subsequent stage. This way |
| 262 | server-goto-toplevel can be executed later, when we know if | 267 | server-goto-toplevel can be executed later, when we know if |
| 263 | it's necessary. | 268 | it's necessary. |
| 264 | Remove the "-version" and "-version-good" support. | 269 | Remove the "-version" and "-version-good" support. |
diff --git a/lisp/frame.el b/lisp/frame.el index 3e7eb9653c0..27dc4be1aa6 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -876,7 +876,7 @@ Calls `suspend-emacs' if invoked from the controlling tty device, | |||
| 876 | (interactive) | 876 | (interactive) |
| 877 | (let ((type (framep (selected-frame)))) | 877 | (let ((type (framep (selected-frame)))) |
| 878 | (cond | 878 | (cond |
| 879 | ((eq type 'x) (iconify-or-deiconify-frame)) | 879 | ((memq type '(x w32)) (iconify-or-deiconify-frame)) |
| 880 | ((eq type t) | 880 | ((eq type t) |
| 881 | (if (controlling-tty-p) | 881 | (if (controlling-tty-p) |
| 882 | (suspend-emacs) | 882 | (suspend-emacs) |