*** empty log message ***

3 files changed, 13 insertions, 20 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index 8cb4641afc..69e005eb4e 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -193,22 +193,6 @@ under the X Window System."
   (funcall frame-creation-function parameters))
 
 
-;;;; Iconification
-
-;;; A possible enhancement for the below: if you iconify a surrogate
-;;; minibuffer frame, iconify all of its minibuffer's users too; 
-;;; de-iconify them as a group.  This will need to wait until frames
-;;; have mapping and unmapping hooks.
-
-(defun iconify ()
-  "Iconify or deiconify the selected frame."
-  (interactive)
-  (let ((frame (selected-frame)))
-    (if (eq (frame-visible-p frame) t)
-	(iconify-frame frame)
-      (make-frame-visible frame))))
-
-
 ;;;; Frame configurations
 
 (defun current-frame-configuration ()
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 83b1fc9590..799e90ff6c 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -428,7 +428,7 @@ This returns ARGS with the arguments that have been processed removed."
 (define-key global-map [begin] 'beginning-of-buffer)
 (define-key global-map [end] 'end-of-buffer)
 
-(define-key global-map "\C-z" 'iconify)
+(define-key global-map "\C-z" 'iconify-frame)
 
 ;;; Do the actual X Windows setup here; the above code just defines
 ;;; functions and variables that we use now.
diff --git a/src/frame.c b/src/frame.c
index 364b9b2e4a..785f59a259 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -697,12 +697,15 @@ DEFUN ("restore-frame-configuration", Frestore_frame_configuration,
 #endif
 
 DEFUN ("make-frame-visible", Fmake_frame_visible, Smake_frame_visible,
-       1, 1, 0,
+       0, 1, 0,
   "Make the frame FRAME visible (assuming it is an X-window).\n\
 Also raises the frame so that nothing obscures it.")
   (frame)
      Lisp_Object frame;
 {
+  if (NILP (frame))
+    frame = selected_frame;
+
   CHECK_LIVE_FRAME (frame, 0);
 
   if (FRAME_IS_X (XFRAME (frame)))
@@ -712,11 +715,14 @@ Also raises the frame so that nothing obscures it.")
 }
 
 DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible,
-       1, 1, 0,
+       0, 1, "",
   "Make the frame FRAME invisible (assuming it is an X-window).")
   (frame)
      Lisp_Object frame;
 {
+  if (NILP (frame))
+    frame = selected_frame;
+
   CHECK_LIVE_FRAME (frame, 0);
 
   if (FRAME_IS_X (XFRAME (frame)))
@@ -726,11 +732,14 @@ DEFUN ("make-frame-invisible", Fmake_frame_invisible, Smake_frame_invisible,
 }
 
 DEFUN ("iconify-frame", Ficonify_frame, Siconify_frame,
-       1, 1, 0,
+       0, 1, "",
   "Make the frame FRAME into an icon.")
   (frame)
      Lisp_Object frame;
 {
+  if (NILP (frame))
+    frame = selected_frame;
+  
   CHECK_LIVE_FRAME (frame, 0);
 
   if (FRAME_IS_X (XFRAME (frame)))