*** empty log message ***

2 files changed, 1 insertions, 17 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index 8cb4641afc7..69e005eb4e6 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 83b1fc9590e..799e90ff6c3 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.