aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-07-24 10:47:05 +0300
committerEli Zaretskii2015-07-24 10:47:05 +0300
commitde576a55d8c47ffd2e24fca2d48ed99f298d4334 (patch)
treeb43f59e55f5387d13537d403859a26efdcaa5812
parent1917d86e1609737046ab1401e7ff7caad93e71a3 (diff)
downloademacs-de576a55d8c47ffd2e24fca2d48ed99f298d4334.tar.gz
emacs-de576a55d8c47ffd2e24fca2d48ed99f298d4334.zip
Don't require GUI frames and mouse for Flyspell menus
* lisp/textmodes/flyspell.el (flyspell-correct-word-before-point) (flyspell-emacs-popup): Require neither a GUI frame nor mouse support, since pop-up menus work with text terminals and can be controlled via the keyboard.
-rw-r--r--lisp/textmodes/flyspell.el7
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 8aadf51871f..a5dff077b1a 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -2087,8 +2087,6 @@ If EVENT is non-nil, it is the mouse event that invoked this operation;
2087that controls where to put the menu. 2087that controls where to put the menu.
2088If OPOINT is non-nil, restore point there after adjusting it for replacement." 2088If OPOINT is non-nil, restore point there after adjusting it for replacement."
2089 (interactive) 2089 (interactive)
2090 (unless (mouse-position)
2091 (error "Pop-up menus do not work on this terminal"))
2092 ;; use the correct dictionary 2090 ;; use the correct dictionary
2093 (flyspell-accept-buffer-local-defs) 2091 (flyspell-accept-buffer-local-defs)
2094 (or opoint (setq opoint (point))) 2092 (or opoint (setq opoint (point)))
@@ -2203,9 +2201,8 @@ If OPOINT is non-nil, restore point there after adjusting it for replacement."
2203;;*---------------------------------------------------------------------*/ 2201;;*---------------------------------------------------------------------*/
2204(defun flyspell-emacs-popup (event poss word) 2202(defun flyspell-emacs-popup (event poss word)
2205 "The Emacs popup menu." 2203 "The Emacs popup menu."
2206 (unless window-system 2204 (if (and (not event)
2207 (error "This command requires pop-up dialogs")) 2205 (display-mouse-p))
2208 (if (not event)
2209 (let* ((mouse-pos (mouse-position)) 2206 (let* ((mouse-pos (mouse-position))
2210 (mouse-pos (if (nth 1 mouse-pos) 2207 (mouse-pos (if (nth 1 mouse-pos)
2211 mouse-pos 2208 mouse-pos