Changeset 18828 for lang/elisp

Timestamp:

09/04/08 14:40:30 (3 months ago)

Author:

imakado

Message:

anything-execute-persistent-actionが実装されたのでそちらを使用。 \n不要になったアドバイスを削除。

Files:

• lang/elisp/anything-c-moccur/branches/new-anything/anything-c-moccur.el (modified) (4 diffs)

lang/elisp/anything-c-moccur/branches/new-anything/anything-c-moccur.el

@@ -217 +217 @@
   (anything-c-moccur-anything-try-execute-persistent-action))
 
-;;; Advise and Hack
-(defun anything-c-moccur-anything-execute-persistent-action ()
-  "If a candidate was selected then perform the associated action without quitting anything."
-  (interactive)
-  (save-selected-window
-    (select-window (get-buffer-window anything-buffer))
-    (select-window (setq minibuffer-scroll-window
-                         (if (one-window-p t) (split-window) (next-window (selected-window) 1))))
-    (let* ((anything-window (get-buffer-window anything-buffer))
-           ;;(same-window-regexps '("."))
-           (selection (if anything-saved-sources
-                          ;; the action list is shown
-                          anything-saved-selection
-                        (anything-get-selection)))
-           (default-action (anything-get-action))
-           (action (assoc-default 'persistent-action (anything-get-current-source))))
-      (setq action (or action default-action))
-      (if (and (listp action)
-               (not (functionp action))) ; lambda
-          ;; select the default action
-          (setq action (cdar action)))
-      (set-window-dedicated-p anything-window t)
-      (unwind-protect
-          (and action selection (funcall action selection))
-        (set-window-dedicated-p anything-window nil)))))
-
 (defun anything-c-moccur-initialize ()
   (setq anything-c-moccur-anything-invoking-flag t)
@@ -249 +223 @@
 
 (defun anything-c-moccur-anything-try-execute-persistent-action ()
-  (when (and (ignore-errors (anything-get-current-source))
-             anything-c-moccur-enable-auto-look-flag)
-    (anything-c-moccur-anything-execute-persistent-action)))
+  (when anything-c-moccur-enable-auto-look-flag
+    (anything-execute-persistent-action)))
 
 (defmacro anything-c-moccur-with-anything-env (sources &rest body)
@@ -483 +456 @@
   (anything-c-moccur-next-line-if-info-line)
 
-  (let ((real-candidate (if anything-saved-sources
-                            ;; the action list is shown
-                            anything-saved-selection
-                          (anything-get-selection))))
+  (let ((real-candidate (anything-get-selection)))
   
     (multiple-value-bind (buffer file-path)
@@ -494 +464 @@
                  (stringp file-path)
                  (file-readable-p file-path))
-        (find-file-other-window file-path)
+        
+        (find-file file-path)
       
         (anything-c-moccur-widen-if-need)