diff options
| author | Glenn Morris | 2015-04-24 14:46:42 -0400 |
|---|---|---|
| committer | Glenn Morris | 2015-04-24 14:46:42 -0400 |
| commit | 5bc9f498de5cc11091588d14e1e27bebb1a08849 (patch) | |
| tree | 511fb515fb39722d05ac1eeaa35bba9e3aca7777 | |
| parent | 82d0f42a4c52196d275470f69788dabf1141765b (diff) | |
| download | emacs-5bc9f498de5cc11091588d14e1e27bebb1a08849.tar.gz emacs-5bc9f498de5cc11091588d14e1e27bebb1a08849.zip | |
* lisp/mouse.el (minor-mode-menu-from-indicator):
Handle non-function members of minor-mode-map-alist. (Bug#20201)
| -rw-r--r-- | lisp/mouse.el | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 5f3fa5d7694..7854d32eb20 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el | |||
| @@ -152,13 +152,16 @@ items `Turn Off' and `Help'." | |||
| 152 | (setq menu | 152 | (setq menu |
| 153 | (if menu | 153 | (if menu |
| 154 | (mouse-menu-non-singleton menu) | 154 | (mouse-menu-non-singleton menu) |
| 155 | `(keymap | 155 | (if (fboundp mm-fun) ; bug#20201 |
| 156 | ,indicator | 156 | `(keymap |
| 157 | (turn-off menu-item "Turn Off minor mode" ,mm-fun) | 157 | ,indicator |
| 158 | (help menu-item "Help for minor mode" | 158 | (turn-off menu-item "Turn Off minor mode" ,mm-fun) |
| 159 | (lambda () (interactive) | 159 | (help menu-item "Help for minor mode" |
| 160 | (describe-function ',mm-fun)))))) | 160 | (lambda () (interactive) |
| 161 | (popup-menu menu)))) | 161 | (describe-function ',mm-fun))))))) |
| 162 | (if menu | ||
| 163 | (popup-menu menu) | ||
| 164 | (message "No menu available"))))) | ||
| 162 | 165 | ||
| 163 | (defun mouse-minor-mode-menu (event) | 166 | (defun mouse-minor-mode-menu (event) |
| 164 | "Show minor-mode menu for EVENT on minor modes area of the mode line." | 167 | "Show minor-mode menu for EVENT on minor modes area of the mode line." |