Changeset 15197 for lang/elisp

Timestamp:

07/05/08 16:56:12 (5 months ago)

Author:

imakado

Message:

 

Files:

• lang/elisp/anything-c-dabbrev/anything-c-dabbrev.el (modified) (3 diffs)

lang/elisp/anything-c-dabbrev/anything-c-dabbrev.el

@@ -20 +20 @@
 
 ;;; Commentary:
-;; 注意: このコードはコンセプトコードみたいなものです。
+;; 注意: このコードはコンセプトコードです。
 
 ;; 設定サンプル
@@ -104 +104 @@
                                     (* (regexp ,dabbrev--abbrev-char-regexp))))))
         (hash (make-hash-table :test 'equal))
-        (ret nil))
+        (ret nil)
+        (cur-point (point)))
     
     (save-excursion
-      (goto-char (point-min))
-      (loop always (re-search-forward re nil t)
-            do (puthash (match-string-no-properties 0) nil hash)) ;uniq
-
+      (let ((ret nil))
+        (goto-char (point-min))
+        (loop always (re-search-forward re cur-point t)
+              do (push (match-string-no-properties 0) ret))
+
+        (mapc (lambda (s)
+                (unless (gethash s hash)
+                  (puthash s nil hash)))
+              ret))
+      
+      (let ((ret nil))
+        (goto-char cur-point)
+        (loop always (re-search-forward re nil t)
+              do (push (match-string-no-properties 0) ret))
+        
+        (mapc (lambda (s)
+                (unless (gethash s hash)
+                  (puthash s nil hash)))
+              (nreverse ret)))
+
+
+      
       (maphash (lambda (symbol-str ignore-value)
                  (push symbol-str ret))
@@ -125 +144 @@
 
       (insert
-       (mapconcat 'identity ret "\n")))))
+       (mapconcat 'identity (nreverse ret) "\n")))))
 
 (defun anything-c-dabbrev-buf-match (list-of-regexp &optional buffer)