aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Gutov2013-11-09 03:12:25 +0200
committerDmitry Gutov2013-11-09 03:12:25 +0200
commitfa47d79686438467deae169e206af0be1bf5ff1d (patch)
tree218a70fa35439d61863c86af7e6bd6920f045684 /lisp
parent62e010af33fa1823a34aba5e843bf04d30fac6e5 (diff)
downloademacs-fa47d79686438467deae169e206af0be1bf5ff1d.tar.gz
emacs-fa47d79686438467deae169e206af0be1bf5ff1d.zip
* lisp/textmodes/ispell.el (ispell-lookup-words): When `look' is not
available and the word has no wildcards, append one to the grep pattern. http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html (ispell-complete-word): Call `ispell-lookup-words' with the value independent of `ispell-look-p'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/textmodes/ispell.el9
2 files changed, 15 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 794b13d752b..6ac129e6a27 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
12013-11-09 Dmitry Gutov <dgutov@yandex.ru>
2
3 * textmodes/ispell.el (ispell-lookup-words): When `look' is not
4 available and the word has no wildcards, append one to the grep
5 pattern.
6 http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00258.html
7 (ispell-complete-word): Call `ispell-lookup-words' with the value
8 independent of `ispell-look-p'.
9
12013-11-08 Dmitry Gutov <dgutov@yandex.ru> 102013-11-08 Dmitry Gutov <dgutov@yandex.ru>
2 11
3 * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): 12 * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p):
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index a361bdae64b..651aaa26688 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -2649,8 +2649,12 @@ if defined."
2649 (message "Starting \"%s\" process..." (file-name-nondirectory prog)) 2649 (message "Starting \"%s\" process..." (file-name-nondirectory prog))
2650 (if look-p 2650 (if look-p
2651 nil 2651 nil
2652 (insert "^" word)
2653 ;; When there are no wildcards, append one, for consistency
2654 ;; with `look' behavior.
2655 (unless wild-p (insert "*"))
2656 (insert "$")
2652 ;; Convert * to .* 2657 ;; Convert * to .*
2653 (insert "^" word "$")
2654 (while (search-backward "*" nil t) (insert ".")) 2658 (while (search-backward "*" nil t) (insert "."))
2655 (setq word (buffer-string)) 2659 (setq word (buffer-string))
2656 (erase-buffer)) 2660 (erase-buffer))
@@ -3785,8 +3789,7 @@ Standard ispell choices are then available."
3785 (or (string= word "") ; Will give you every word 3789 (or (string= word "") ; Will give you every word
3786 (ispell-lookup-words 3790 (ispell-lookup-words
3787 (concat (and interior-frag "*") word 3791 (concat (and interior-frag "*") word
3788 (if (or interior-frag (null ispell-look-p)) 3792 (and interior-frag "*"))
3789 "*"))
3790 (or ispell-complete-word-dict 3793 (or ispell-complete-word-dict
3791 ispell-alternate-dictionary)))) 3794 ispell-alternate-dictionary))))
3792 (cond ((eq possibilities t) 3795 (cond ((eq possibilities t)