diff options
| author | Glenn Morris | 2009-10-17 03:10:10 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-10-17 03:10:10 +0000 |
| commit | f3e3a990e7b1309d6a99e70118c0242595bdfe74 (patch) | |
| tree | 2d6cf76e83f0541d8c458509164b5c150be91b2a | |
| parent | a567af584204fc3bc50c5d0584101e077f51e5f9 (diff) | |
| download | emacs-f3e3a990e7b1309d6a99e70118c0242595bdfe74.tar.gz emacs-f3e3a990e7b1309d6a99e70118c0242595bdfe74.zip | |
Jari Aalto <jari.aalto at cante.net>
(flyspell-get-word): Make `following' argument optional, since that is
how it is documented, and this is often called with a nil argument. (Bug#4577)
(flyspell-external-point-words, flyspell-auto-correct-word)
(flyspell-correct-word-before-point, flyspell-word-search-forward)
(flyspell-word-search-backward): Remove nil argument in calls to
flyspell-get-word, since it is not needed now.
| -rw-r--r-- | lisp/ChangeLog | 17 | ||||
| -rw-r--r-- | lisp/textmodes/flyspell.el | 12 |
2 files changed, 23 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 079cac1afc0..fae8308bf5b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,20 @@ | |||
| 1 | 2009-10-17 Jari Aalto <jari.aalto@cante.net> | ||
| 2 | |||
| 3 | * textmodes/ispell.el (ispell-get-decoded-string): Give an error | ||
| 4 | if no match is found for the current dictionary. (Bug#4578) | ||
| 5 | |||
| 6 | * textmodes/flyspell.el (flyspell-get-word): Make `following' argument | ||
| 7 | optional, since that is how it is documented, and this is often called | ||
| 8 | with a nil argument. (Bug#4577) | ||
| 9 | (flyspell-external-point-words, flyspell-auto-correct-word) | ||
| 10 | (flyspell-correct-word-before-point, flyspell-word-search-forward) | ||
| 11 | (flyspell-word-search-backward): Remove nil argument in calls to | ||
| 12 | flyspell-get-word, since it is not needed now. | ||
| 13 | |||
| 14 | 2009-10-17 Ulrich Mueller <ulm@gentoo.org> | ||
| 15 | |||
| 16 | * play/doctor.el (doctor-adverbp): Exclude some nouns. (Bug#4565) | ||
| 17 | |||
| 1 | 2009-10-16 Glenn Morris <rgm@gnu.org> | 18 | 2009-10-16 Glenn Morris <rgm@gnu.org> |
| 2 | 19 | ||
| 3 | * net/rcirc.el (rcirc-authenticate): Simplify previous change. | 20 | * net/rcirc.el (rcirc-authenticate): Simplify previous change. |
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index 2c8ccd6054d..6c1c4c3c221 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el | |||
| @@ -986,7 +986,7 @@ Mostly we check word delimiters." | |||
| 986 | (inhibit-point-motion-hooks t) | 986 | (inhibit-point-motion-hooks t) |
| 987 | p) | 987 | p) |
| 988 | (while (and (not r) (setq p (search-backward word bound t))) | 988 | (while (and (not r) (setq p (search-backward word bound t))) |
| 989 | (let ((lw (flyspell-get-word '()))) | 989 | (let ((lw (flyspell-get-word))) |
| 990 | (if (and (consp lw) (string-equal (car lw) word)) | 990 | (if (and (consp lw) (string-equal (car lw) word)) |
| 991 | (setq r p) | 991 | (setq r p) |
| 992 | (goto-char p)))) | 992 | (goto-char p)))) |
| @@ -1001,7 +1001,7 @@ Mostly we check word delimiters." | |||
| 1001 | (inhibit-point-motion-hooks t) | 1001 | (inhibit-point-motion-hooks t) |
| 1002 | p) | 1002 | p) |
| 1003 | (while (and (not r) (setq p (search-forward word bound t))) | 1003 | (while (and (not r) (setq p (search-forward word bound t))) |
| 1004 | (let ((lw (flyspell-get-word '()))) | 1004 | (let ((lw (flyspell-get-word))) |
| 1005 | (if (and (consp lw) (string-equal (car lw) word)) | 1005 | (if (and (consp lw) (string-equal (car lw) word)) |
| 1006 | (setq r p) | 1006 | (setq r p) |
| 1007 | (goto-char (1+ p))))) | 1007 | (goto-char (1+ p))))) |
| @@ -1250,7 +1250,7 @@ this function changes the last char of the `ispell-casechars' string." | |||
| 1250 | ;;*---------------------------------------------------------------------*/ | 1250 | ;;*---------------------------------------------------------------------*/ |
| 1251 | ;;* flyspell-get-word ... */ | 1251 | ;;* flyspell-get-word ... */ |
| 1252 | ;;*---------------------------------------------------------------------*/ | 1252 | ;;*---------------------------------------------------------------------*/ |
| 1253 | (defun flyspell-get-word (following &optional extra-otherchars) | 1253 | (defun flyspell-get-word (&optional following extra-otherchars) |
| 1254 | "Return the word for spell-checking according to Ispell syntax. | 1254 | "Return the word for spell-checking according to Ispell syntax. |
| 1255 | If optional argument FOLLOWING is non-nil or if `flyspell-following-word' | 1255 | If optional argument FOLLOWING is non-nil or if `flyspell-following-word' |
| 1256 | is non-nil when called interactively, then the following word | 1256 | is non-nil when called interactively, then the following word |
| @@ -1394,7 +1394,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'." | |||
| 1394 | ;; Move back into the match | 1394 | ;; Move back into the match |
| 1395 | ;; so flyspell-get-word will find it. | 1395 | ;; so flyspell-get-word will find it. |
| 1396 | (forward-char -1) | 1396 | (forward-char -1) |
| 1397 | (flyspell-get-word nil))) | 1397 | (flyspell-get-word))) |
| 1398 | (found (car found-list)) | 1398 | (found (car found-list)) |
| 1399 | (found-length (length found)) | 1399 | (found-length (length found)) |
| 1400 | (misspell-length (length word))) | 1400 | (misspell-length (length word))) |
| @@ -1887,7 +1887,7 @@ This command proposes various successive corrections for the current word." | |||
| 1887 | (flyspell-ajust-cursor-point pos (point) old-max) | 1887 | (flyspell-ajust-cursor-point pos (point) old-max) |
| 1888 | (setq flyspell-auto-correct-pos (point))) | 1888 | (setq flyspell-auto-correct-pos (point))) |
| 1889 | ;; fetch the word to be checked | 1889 | ;; fetch the word to be checked |
| 1890 | (let ((word (flyspell-get-word nil))) | 1890 | (let ((word (flyspell-get-word))) |
| 1891 | (if (consp word) | 1891 | (if (consp word) |
| 1892 | (let ((start (car (cdr word))) | 1892 | (let ((start (car (cdr word))) |
| 1893 | (end (car (cdr (cdr word)))) | 1893 | (end (car (cdr (cdr word)))) |
| @@ -2049,7 +2049,7 @@ If OPOINT is non-nil, restore point there after adjusting it for replacement." | |||
| 2049 | (flyspell-accept-buffer-local-defs) | 2049 | (flyspell-accept-buffer-local-defs) |
| 2050 | (or opoint (setq opoint (point))) | 2050 | (or opoint (setq opoint (point))) |
| 2051 | (let ((cursor-location (point)) | 2051 | (let ((cursor-location (point)) |
| 2052 | (word (flyspell-get-word nil))) | 2052 | (word (flyspell-get-word))) |
| 2053 | (if (consp word) | 2053 | (if (consp word) |
| 2054 | (let ((start (car (cdr word))) | 2054 | (let ((start (car (cdr word))) |
| 2055 | (end (car (cdr (cdr word)))) | 2055 | (end (car (cdr (cdr word)))) |