diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2020-08-27 06:48:39 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2020-08-27 06:51:47 +0200 |
| commit | 15f6c07f15b59d4521cab2c2d6614915fea3cfbb (patch) | |
| tree | aebf0e4e5be9c5d38818a795efcb3fa0d18c52f5 /lisp | |
| parent | 587a60cc0fb80e7be51707b75bc9e097714a250c (diff) | |
| download | emacs-15f6c07f15b59d4521cab2c2d6614915fea3cfbb.tar.gz emacs-15f6c07f15b59d4521cab2c2d6614915fea3cfbb.tar.bz2 emacs-15f6c07f15b59d4521cab2c2d6614915fea3cfbb.zip | |
Refer to correct mouse button in flyspell message
* lisp/textmodes/flyspell.el (make-flyspell-overlay)
(flyspell-mode-on): Refer to mouse-3 in help messages when the
variable 'flyspell-use-mouse-3-for-menu' is non-nil. (Bug#11680)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/textmodes/flyspell.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 23f96d7e0ee..0af8ba872db 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -645,14 +645,15 @@ in your init file. ;; the welcome message (if (and flyspell-issue-message-flag flyspell-issue-welcome-flag - (called-interactively-p 'interactive)) - (let ((binding (where-is-internal 'flyspell-auto-correct-word - nil 'non-ascii))) - (message "%s" - (if binding - (format "Welcome to flyspell. Use %s or Mouse-2 to correct words." - (key-description binding)) - "Welcome to flyspell. Use Mouse-2 to correct words."))))) + (called-interactively-p 'interactive)) + (let* ((binding (where-is-internal 'flyspell-auto-correct-word + nil 'non-ascii)) + (mouse-button (if flyspell-use-mouse-3-for-menu + "Mouse-3" "Mouse-2"))) + (message "Welcome to Flyspell. Use %s to correct words" + (if binding + (format "%s or %s" (key-description binding) mouse-button) + (format "%s" mouse-button)))))) ;;*---------------------------------------------------------------------*/ ;;* flyspell-delay-commands ... */ @@ -1802,7 +1803,9 @@ for the overlay." (overlay-put overlay 'mouse-face mouse-face) (overlay-put overlay 'flyspell-overlay t) (overlay-put overlay 'evaporate t) - (overlay-put overlay 'help-echo "mouse-2: correct word at point") + (overlay-put overlay 'help-echo (concat (if flyspell-use-mouse-3-for-menu + "mouse-3" + "mouse-2") ": correct word at point")) ;; If misspelled text has a 'keymap' property, let that remain in ;; effect for the bindings that flyspell-mouse-map doesn't override. (set-keymap-parent flyspell-mouse-map (get-char-property beg 'keymap)) |