ns-win.el (x-select-font): defailias x-select-font to

ns-popup-font-panel instead of generate-fontset-menu.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ee98df2dc7e3285d78b92649f747bc57fc4eefe..4135cca40e7b0cbabebe96b378a816c6a60eff05 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-13  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * term/ns-win.el (x-select-font): defailias x-select-font to
+       ns-popup-font-panel instead of generate-fontset-menu.
+
 2009-07-12  Eli Zaretskii  <eliz@gnu.org>
 
        * desktop.el (desktop-buffers-not-to-save): Remove ".log". (Bug#3833)

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 3c963c3ca549c57ae7205cead6a739e593e10bdd..20056dab699ce37f6d93e868083237af818ce9cc 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -931,7 +931,7 @@ unless the current buffer is a scratch buffer."
 
 ;; Set to use font panel instead
 (declare-function ns-popup-font-panel "nsfns.m" (&optional frame))
-(defalias 'generate-fontset-menu 'ns-popup-font-panel "Pop up the font panel.
+(defalias 'x-select-font 'ns-popup-font-panel "Pop up the font panel.
 This function has been overloaded in Nextstep.")
 (defalias 'mouse-set-font 'ns-popup-font-panel "Pop up the font panel.
 This function has been overloaded in Nextstep.")