(w32-focus-frame): Make obsolete alias for x-focus-frame.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 241787155af73e9d06586da2b1663f53d061c0d6..d75995a3b54db95565bc37b7feb2d82a781bd8f6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-18  Jason Rumney  <jasonr@gnu.org>
+
+       * term/w32-win.el (w32-focus-frame): Make obsolete alias for
+       x-focus-frame.
+
+       * frame.el (select-frame-set-input-focus, select-frame-by-name):
+       Use x-focus-frame for w32.
+
 2007-09-17  David Kastrup  <dak@gnu.org>
 
        * textmodes/tex-mode.el (tex-verbatim-environments):

diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index e2b88086eac52dbadd2356dc807f3bf2fa58f057..5c3a1aae62e1163d48f4a6cc958f056807da1581 100644 (file)
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -80,6 +80,10 @@
 (require 'dnd)
 (require 'code-pages)
 
+;; Keep an obsolete alias for w32-focus-frame in case it is used by code
+;; outside Emacs.
+(define-obsolete-function-alias 'w32-focus-frame 'x-focus-frame "23.1")
+
 (defvar xlfd-regexp-registry-subnum)
 
 ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
@@ -1122,7 +1126,10 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')."
         (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll")
         (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll")
         (tiff "libtiff3.dll" "libtiff.dll")
-        (gif "giflib4.dll" "libungif4.dll" "libungif.dll")))
+        (gif "giflib4.dll" "libungif4.dll" "libungif.dll")
+        (svg "librsvg-2-2.dll")
+        (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll")
+        (glib "libglib-2.0-0.dll")))
 
 ;;; multi-tty support
 (defvar w32-initialized nil