Changeset 4166 for trunk/lisp/textmodes/flyspell.el

Timestamp:

2006年09月18日 20時48分14秒 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/textmodes/flyspell.el (modified) (8 diffs)

trunk/lisp/textmodes/flyspell.el

@@ -993 +993 @@
-    (let* ((cursor-location (point))
-           (flyspell-word (flyspell-get-word following))
-
+ ispell-filter
-      (if (or (eq flyspell-word nil)
-              (and (fboundp flyspell-generic-check-word-predicate)
@@ -1051 +1051 @@
-            ;; (ispell-send-string "!\n")
-            ;; back to terse mode.
+            ;; Remove leading empty element
-            (setq ispell-filter (cdr ispell-filter))
+            ;; ispell process should return something after word is sent.
+            ;; Tag word as valid (i.e., skip) otherwise
+            (or ispell-filter
+                (setq ispell-filter '(*)))
-            (if (consp ispell-filter)
-                (setq poss (ispell-parse-output (car ispell-filter))))
@@ -1456 +1461 @@
-              (delete-region (match-beginning 0) (match-end 0)))))))))
-
+;;* ---------------------------------------------------------------
+;;*     flyspell-check-region-doublons
+;;* ---------------------------------------------------------------
+(defun flyspell-check-region-doublons (beg end)
+  "Check for adjacent duplicated words (doublons) in the given region."
+  (save-excursion
+    (goto-char beg)
+    (flyspell-word)     ; Make sure current word is checked
+    (backward-word 1)
+    (while (and (< (point) end)
+                (re-search-forward "\\b\\([^ \n\t]+\\)[ \n\t]+\\1\\b"
+                                   end 'move))
+      (flyspell-word)
+      (backward-word 1))
+    (flyspell-word)))
+
-;;*---------------------------------------------------------------------*/
-;;*    flyspell-large-region ...                                        */
@@ -1500 +1521 @@
-            (flyspell-process-localwords buffer)
-            (with-current-buffer curbuf
-
+
+
-            (flyspell-external-point-words))
-        (error "Can't check region...")))))
@@ -1831 +1853 @@
-                  (end (car (cdr (cdr word))))
-                  (word (car word))
-
+ ispell-filter
-              (setq flyspell-auto-correct-word word)
-              ;; now check spelling of word.
@@ -1840 +1862 @@
-                       (accept-process-output ispell-process)
-                       (not (string= "" (car ispell-filter)))))
+              ;; Remove leading empty element
-              (setq ispell-filter (cdr ispell-filter))
+              ;; ispell process should return something after word is sent.
+              ;; Tag word as valid (i.e., skip) otherwise
+              (or ispell-filter
+                  (setq ispell-filter '(*)))
-              (if (consp ispell-filter)
-                  (setq poss (ispell-parse-output (car ispell-filter))))
@@ -1981 +2008 @@
-                (end (car (cdr (cdr word))))
-                (word (car word))
-
+ ispell-filter
-            ;; now check spelling of word.
-            (ispell-send-string "%\n") ;put in verbose mode
@@ -1989 +2016 @@
-                     (accept-process-output ispell-process)
-                     (not (string= "" (car ispell-filter)))))
+            ;; Remove leading empty element
-            (setq ispell-filter (cdr ispell-filter))
+            ;; ispell process should return something after word is sent.
+            ;; Tag word as valid (i.e., skip) otherwise
+            (or ispell-filter
+                (setq ispell-filter '(*)))
-            (if (consp ispell-filter)
-                (setq poss (ispell-parse-output (car ispell-filter))))