diff options
| author | Chong Yidong | 2009-01-27 20:43:27 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-01-27 20:43:27 +0000 |
| commit | c1202d4b3572de440b3141bc203dccf147bf22f6 (patch) | |
| tree | c1e77563db7218c00c1e5e137c45e1c629844446 | |
| parent | 902528809e9567e79a7f10ef298997a25dbad357 (diff) | |
| download | emacs-c1202d4b3572de440b3141bc203dccf147bf22f6.tar.gz emacs-c1202d4b3572de440b3141bc203dccf147bf22f6.zip | |
(mouse-select-font): Return a string instead of a list.
| -rw-r--r-- | lisp/mouse.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 58cf53a1f4c..5eef35de097 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el | |||
| @@ -2431,12 +2431,13 @@ and selects that window." | |||
| 2431 | (interactive) | 2431 | (interactive) |
| 2432 | (unless (display-multi-font-p) | 2432 | (unless (display-multi-font-p) |
| 2433 | (error "Cannot change fonts on this display")) | 2433 | (error "Cannot change fonts on this display")) |
| 2434 | (x-popup-menu | 2434 | (car |
| 2435 | (if (listp last-nonmenu-event) | 2435 | (x-popup-menu |
| 2436 | last-nonmenu-event | 2436 | (if (listp last-nonmenu-event) |
| 2437 | (list '(0 0) (selected-window))) | 2437 | last-nonmenu-event |
| 2438 | (append x-fixed-font-alist | 2438 | (list '(0 0) (selected-window))) |
| 2439 | (list (generate-fontset-menu))))) | 2439 | (append x-fixed-font-alist |
| 2440 | (list (generate-fontset-menu)))))) | ||
| 2440 | 2441 | ||
| 2441 | (declare-function text-scale-mode "face-remap") | 2442 | (declare-function text-scale-mode "face-remap") |
| 2442 | 2443 | ||