# HG changeset patch # User Glenn Morris # Date 1255748993 0 # Node ID 4c1014e9a8e345f3daf6dce23eb12065e9dc246c # Parent 062d17ee6c05217ebfcf38abe59a6cb5a78ab44a Jari Aalto (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. diff -r 062d17ee6c05 -r 4c1014e9a8e3 lisp/textmodes/flyspell.el --- a/lisp/textmodes/flyspell.el Sat Oct 17 03:09:25 2009 +0000 +++ b/lisp/textmodes/flyspell.el Sat Oct 17 03:09:53 2009 +0000 @@ -986,7 +986,7 @@ (inhibit-point-motion-hooks t) p) (while (and (not r) (setq p (search-backward word bound t))) - (let ((lw (flyspell-get-word '()))) + (let ((lw (flyspell-get-word))) (if (and (consp lw) (string-equal (car lw) word)) (setq r p) (goto-char p)))) @@ -1001,7 +1001,7 @@ (inhibit-point-motion-hooks t) p) (while (and (not r) (setq p (search-forward word bound t))) - (let ((lw (flyspell-get-word '()))) + (let ((lw (flyspell-get-word))) (if (and (consp lw) (string-equal (car lw) word)) (setq r p) (goto-char (1+ p))))) @@ -1250,7 +1250,7 @@ ;;*---------------------------------------------------------------------*/ ;;* flyspell-get-word ... */ ;;*---------------------------------------------------------------------*/ -(defun flyspell-get-word (following &optional extra-otherchars) +(defun flyspell-get-word (&optional following extra-otherchars) "Return the word for spell-checking according to Ispell syntax. If optional argument FOLLOWING is non-nil or if `flyspell-following-word' is non-nil when called interactively, then the following word @@ -1394,7 +1394,7 @@ ;; Move back into the match ;; so flyspell-get-word will find it. (forward-char -1) - (flyspell-get-word nil))) + (flyspell-get-word))) (found (car found-list)) (found-length (length found)) (misspell-length (length word))) @@ -1887,7 +1887,7 @@ (flyspell-ajust-cursor-point pos (point) old-max) (setq flyspell-auto-correct-pos (point))) ;; fetch the word to be checked - (let ((word (flyspell-get-word nil))) + (let ((word (flyspell-get-word))) (if (consp word) (let ((start (car (cdr word))) (end (car (cdr (cdr word)))) @@ -2049,7 +2049,7 @@ (flyspell-accept-buffer-local-defs) (or opoint (setq opoint (point))) (let ((cursor-location (point)) - (word (flyspell-get-word nil))) + (word (flyspell-get-word))) (if (consp word) (let ((start (car (cdr word))) (end (car (cdr (cdr word))))