diff options
| author | Jan Djärv | 2009-07-13 10:18:03 +0000 |
|---|---|---|
| committer | Jan Djärv | 2009-07-13 10:18:03 +0000 |
| commit | 285712468c1aa1a0ce61dff22a2a874663405c1b (patch) | |
| tree | 76c63fcee9c90334bc9a67523ff82ed73cbf01cb /lisp | |
| parent | e2402a5e4a4847258d5f6d3c3f487f983ad89a09 (diff) | |
| download | emacs-285712468c1aa1a0ce61dff22a2a874663405c1b.tar.gz emacs-285712468c1aa1a0ce61dff22a2a874663405c1b.zip | |
ns-win.el (x-select-font): defailias x-select-font to
ns-popup-font-panel instead of generate-fontset-menu.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/term/ns-win.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ee98df2dc7..4135cca40e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-07-13 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * term/ns-win.el (x-select-font): defailias x-select-font to | ||
| 4 | ns-popup-font-panel instead of generate-fontset-menu. | ||
| 5 | |||
| 1 | 2009-07-12 Eli Zaretskii <eliz@gnu.org> | 6 | 2009-07-12 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * desktop.el (desktop-buffers-not-to-save): Remove ".log". (Bug#3833) | 8 | * 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 3c963c3ca54..20056dab699 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el | |||
| @@ -931,7 +931,7 @@ unless the current buffer is a scratch buffer." | |||
| 931 | 931 | ||
| 932 | ;; Set to use font panel instead | 932 | ;; Set to use font panel instead |
| 933 | (declare-function ns-popup-font-panel "nsfns.m" (&optional frame)) | 933 | (declare-function ns-popup-font-panel "nsfns.m" (&optional frame)) |
| 934 | (defalias 'generate-fontset-menu 'ns-popup-font-panel "Pop up the font panel. | 934 | (defalias 'x-select-font 'ns-popup-font-panel "Pop up the font panel. |
| 935 | This function has been overloaded in Nextstep.") | 935 | This function has been overloaded in Nextstep.") |
| 936 | (defalias 'mouse-set-font 'ns-popup-font-panel "Pop up the font panel. | 936 | (defalias 'mouse-set-font 'ns-popup-font-panel "Pop up the font panel. |
| 937 | This function has been overloaded in Nextstep.") | 937 | This function has been overloaded in Nextstep.") |