Changeset 19141 for lang/elisp

Timestamp:

09/10/08 23:14:13 (2 months ago)

Author:

imakado

Message:

anything-c-moccur-isearch-forward anything-c-moccur-isearch-backward anything-c-moccur-resume の三つのコマンドを追加。\_>等の記号のみの入力の際に動作しないように。

Files:

• lang/elisp/anything-c-moccur/trunk/anything-c-moccur.el (modified) (11 diffs)

lang/elisp/anything-c-moccur/trunk/anything-c-moccur.el

@@ -3 +3 @@
 
 ;; Author: Kenji.Imakado <ken.imakaado -at- gmail.com>
-;; Version: 0.2
 ;; Keywords: occur
 ;; Prefix: anything-c-moccur-
@@ -33 +32 @@
 ;;           '(lambda ()
 ;;              (local-set-key (kbd "O") 'anything-c-moccur-dired-do-moccur-by-moccur)))
+;; (global-set-key (kbd "C-M-s") 'anything-c-moccur-isearch-forward)
+;; (global-set-key (kbd "C-M-r") 'anything-c-moccur-isearch-backward)
+
+;;; Todo:
+;; resume
 
 ;;;code:
@@ -98 +102 @@
 
 ;;; variables
+(defvar anything-c-moccur-version 0.3)
 (defvar anything-c-moccur-anything-invoking-flag nil)
 (defvar anything-c-moccur-anything-initial-pattern "")
@@ -230 +235 @@
       (anything-execute-persistent-action))))
 
+(defvar anything-c-moccur-last-buffer nil)
 (defmacro anything-c-moccur-with-anything-env (sources &rest body)
   (declare (indent 1))
@@ -242 +248 @@
          (progn
            ,@body)
-       (remove-hook 'anything-c-moccur-anything-after-update-hook 'anything-c-moccur-anything-try-execute-persistent-action))))
+       (remove-hook 'anything-c-moccur-anything-after-update-hook 'anything-c-moccur-anything-try-execute-persistent-action)
+       (setq anything-c-moccur-last-buffer anything-current-buffer))))
+
 
 (defun anything-c-moccur-clean-up ()
@@ -316 +324 @@
     ad-do-it)))
 
+(defun anything-c-moccur-bad-regexp-p (re)
+  (or (string-match (rx bol (+ space) eol) re)
+      (string-equal "" re)
+      (string-match (rx bol (* (any "<" ">" "\\" "_" "`")) eol) re)))
+
 (defun anything-c-moccur-moccur-search (regexp arg buffers)
   (ignore-errors
@@ -324 +337 @@
           (ad-activate 'moccur-search)
           ;; 空白のみで呼ばれると固まることがあったので追加
-          (when (or (string-match (rx bol (+ space) eol) anything-pattern)
-                    (string-equal "" anything-pattern))
+          (when (anything-c-moccur-bad-regexp-p anything-pattern)
             (error ""))
 
@@ -374 +386 @@
     (volatile)))
 
-(defun anything-c-moccur-occur-by-moccur ()
-  (interactive)
-  (anything-c-moccur-with-anything-env (list anything-c-source-occur-by-moccur)
-    (let* ((initial-pattern (if anything-c-moccur-enable-initial-pattern
-                                (or (thing-at-point 'symbol) "")
-                              "")))
-      (when anything-c-moccur-push-mark-flag
-        (push-mark))
-      (anything nil initial-pattern))))
+(defun anything-c-moccur-occur-by-moccur (&optional prefix)
+  (interactive "P")
+  (if prefix
+      (anything-c-moccur-resume)
+    (anything-c-moccur-with-anything-env (list anything-c-source-occur-by-moccur)
+      (let* ((initial-pattern (if anything-c-moccur-enable-initial-pattern
+                                  (or (thing-at-point 'symbol) "")
+                                "")))
+        (when anything-c-moccur-push-mark-flag
+          (push-mark))
+        (anything nil initial-pattern)))))
 
 (defun anything-c-moccur-occur-by-moccur-only-function ()
@@ -396 +410 @@
     (when anything-c-moccur-push-mark-flag
       (push-mark))
-    (anything ";;; ")))
+    (anything nil ";;; ")))
 
 (defun anything-c-moccur-query-replace-regexp ()
@@ -538 +552 @@
     (anything-c-moccur-with-anything-env (list anything-c-source-dired-do-moccur)
       (anything))))
+
+;;; Commands
+
+(defun anything-c-moccur-last-sources-is-moccur-p ()
+  (and (equal anything-c-moccur-last-buffer (current-buffer))
+       (every (lambda (source)
+                (let ((source (if (listp source) source (symbol-value source))))
+                  (string-match "moccur" (assoc-default 'name source))))
+              anything-last-sources)))
+
+(defun anything-c-moccur-resume ()
+  (interactive)
+  (if (anything-c-moccur-last-sources-is-moccur-p)
+      (anything-c-moccur-with-anything-env anything-last-sources
+        (anything-c-moccur-initialize)
+        (anything-resume))
+    (message "last source is not anything-c-moccur source")))
+
+(defun anything-c-moccur-isearch-forward ()
+  (interactive)
+  (let ((anything-c-moccur-widen-when-goto-line-flag nil))
+    (save-restriction
+      (narrow-to-region (point-at-bol) (point-max))
+      (anything-c-moccur-occur-by-moccur))))
+
+(defun anything-c-moccur-isearch-backward ()
+  (interactive)
+  (let* ((anything-c-moccur-widen-when-goto-line-flag nil)
+         (copied-source (copy-alist anything-c-source-occur-by-moccur)) ;anything-c-source-occur-by-moccur is list. not symbol
+         (anything-c-source-occur-by-moccur (cons '(candidate-transformer . (lambda (-candidates)
+                                                                              (reverse -candidates)))
+                                                  copied-source)))
+    (save-restriction
+      (narrow-to-region (point-min) (point-at-eol))
+      (anything-c-moccur-occur-by-moccur))))
 
 ;;; Commands for `anything-c-moccur-anything-map'
@@ -650 +699 @@
             '(anything-c-source-occur-by-moccur) "bbb")
            (kill-buffer buf)))))
+      (desc "anything-c-moccur-bad-regexp-p")
+      (expect t
+        (when (anything-c-moccur-bad-regexp-p "\\_>") t))
+        
         )))