Merge from emacs-23

[gnu-emacs] / lisp / vc / ediff-wind.el

diff --git a/lisp/ediff-wind.el b/lisp/vc/ediff-wind.el
similarity index 99%
rename from lisp/ediff-wind.el
rename to lisp/vc/ediff-wind.el
index db4b57cbe0706ab8e56d9e9f4f233d1e36039626..1057dd4c9aa90266ccd48be0ada50831e07098c3 100644 (file)
--- a/lisp/ediff-wind.el
+++ b/lisp/vc/ediff-wind.el
@@ -4,6 +4,7 @@
 ;;   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
+;; Package: ediff
 
 ;; This file is part of GNU Emacs.
 
@@ -977,12 +978,11 @@ into icons, regardless of the window manager."
          (set-specifier left-toolbar-width (list ctl-frame 0))
          (set-specifier right-toolbar-width (list ctl-frame 0))))
 
-    ;; Under OS/2 (emx) we have to call modify frame parameters twice, in order
-    ;; to make sure that at least once we do it for non-iconified frame.  If
-    ;; appears that in the OS/2 port of Emacs, one can't modify frame
-    ;; parameters of iconified frames.  As a precaution, we do likewise for
-    ;; windows-nt.
-    (if (memq system-type '(emx windows-nt windows-95))
+    ;; As a precaution, we call modify frame parameters twice, in
+    ;; order to make sure that at least once we do it for
+    ;; a non-iconified frame.  (It appears that in the Windows port of
+    ;; Emacs, one can't modify frame parameters of iconified frames.)
+    (if (eq system-type 'windows-nt)
        (modify-frame-parameters ctl-frame adjusted-parameters))
 
     ;; make or zap toolbar (if not requested)
@@ -1309,5 +1309,4 @@ It assumes that it is called from within the control buffer."
 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
 ;; End:
 
-;; arch-tag: 73d9a5d7-eed7-4d9c-8b4b-21d5d78eb597
 ;;; ediff-wind.el ends here