diff options
| -rw-r--r-- | lisp/mouse.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index dba63ce3084..4e5cb50b4a3 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el | |||
| @@ -157,7 +157,7 @@ Interactively, INDICATOR is read using completion. | |||
| 157 | If there is no menu defined for the minor mode, then create one with | 157 | If there is no menu defined for the minor mode, then create one with |
| 158 | items `Turn Off' and `Help'." | 158 | items `Turn Off' and `Help'." |
| 159 | (interactive | 159 | (interactive |
| 160 | (list (completing-read | 160 | (list (completing-read |
| 161 | "Minor mode indicator: " | 161 | "Minor mode indicator: " |
| 162 | (describe-minor-mode-completion-table-for-indicator)))) | 162 | (describe-minor-mode-completion-table-for-indicator)))) |
| 163 | (let ((minor-mode (lookup-minor-mode-from-indicator indicator))) | 163 | (let ((minor-mode (lookup-minor-mode-from-indicator indicator))) |
| @@ -171,7 +171,7 @@ items `Turn Off' and `Help'." | |||
| 171 | ,indicator | 171 | ,indicator |
| 172 | (turn-off menu-item "Turn Off minor mode" ,minor-mode) | 172 | (turn-off menu-item "Turn Off minor mode" ,minor-mode) |
| 173 | (help menu-item "Help for minor mode" | 173 | (help menu-item "Help for minor mode" |
| 174 | (lambda () (interactive) | 174 | (lambda () (interactive) |
| 175 | (describe-function ',minor-mode)))))) | 175 | (describe-function ',minor-mode)))))) |
| 176 | (popup-menu menu)))) | 176 | (popup-menu menu)))) |
| 177 | 177 | ||
| @@ -266,7 +266,7 @@ Default to the Edit menu if the major mode doesn't define a menu." | |||
| 266 | (interactive "@e\nP") | 266 | (interactive "@e\nP") |
| 267 | (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) | 267 | (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) |
| 268 | (popup-menu (mouse-menu-major-mode-map) event prefix)) | 268 | (popup-menu (mouse-menu-major-mode-map) event prefix)) |
| 269 | (make-obsolete 'mouse-major-mode-menu 'mouse-menu-major-mode-map) | 269 | (make-obsolete 'mouse-major-mode-menu 'mouse-menu-major-mode-map "23.1") |
| 270 | 270 | ||
| 271 | (defun mouse-popup-menubar (event prefix) | 271 | (defun mouse-popup-menubar (event prefix) |
| 272 | "Pop up a menu equivalent to the menu bar for keyboard EVENT with PREFIX. | 272 | "Pop up a menu equivalent to the menu bar for keyboard EVENT with PREFIX. |
| @@ -275,7 +275,7 @@ not it is actually displayed." | |||
| 275 | (interactive "@e \nP") | 275 | (interactive "@e \nP") |
| 276 | (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) | 276 | (run-hooks 'activate-menubar-hook 'menu-bar-update-hook) |
| 277 | (popup-menu (mouse-menu-bar-map) event prefix)) | 277 | (popup-menu (mouse-menu-bar-map) event prefix)) |
| 278 | (make-obsolete 'mouse-popup-menubar 'mouse-menu-bar-map) | 278 | (make-obsolete 'mouse-popup-menubar 'mouse-menu-bar-map "23.1") |
| 279 | 279 | ||
| 280 | (defun mouse-popup-menubar-stuff (event prefix) | 280 | (defun mouse-popup-menubar-stuff (event prefix) |
| 281 | "Popup a menu like either `mouse-major-mode-menu' or `mouse-popup-menubar'. | 281 | "Popup a menu like either `mouse-major-mode-menu' or `mouse-popup-menubar'. |
| @@ -287,7 +287,7 @@ Use the former if the menu bar is showing, otherwise the latter." | |||
| 287 | (mouse-menu-bar-map) | 287 | (mouse-menu-bar-map) |
| 288 | (mouse-menu-major-mode-map)) | 288 | (mouse-menu-major-mode-map)) |
| 289 | event prefix)) | 289 | event prefix)) |
| 290 | (make-obsolete 'mouse-popup-menubar-stuff nil) | 290 | (make-obsolete 'mouse-popup-menubar-stuff nil "23.1") |
| 291 | 291 | ||
| 292 | ;; Commands that operate on windows. | 292 | ;; Commands that operate on windows. |
| 293 | 293 | ||