Changeset 19697 for lang/elisp

Timestamp:

09/22/08 02:04:26 (2 months ago)

Author:

imakado

Message:

キーバインドを追加。anything起動中のキーバインドを追加。PERL5LIBに追加する際に末尾に:が入ってしまう場合があったのに対応。非同期でインストールされているモジュールを収得する際に前回の結果がクリアされていなかったのを修正。plcmp-get-module-file-pathがフルパスを返すように。他のperlバッファから補完候補を収得する部分にキャッシュを実装。

Files:

• lang/elisp/perl-completion/branch/1.0/perl-completion.el (modified) (57 diffs)

lang/elisp/perl-completion/branch/1.0/perl-completion.el

@@ -30 +30 @@
 
 ;; TODO:
-;; set-perl5lib
-;; open doc -> occur
-;; when remote(tramp) set-perl5lib
 ;; plcmp-cmd-show-environment
 
@@ -43 +40 @@
 
 
-
-
+;;; customize-variables
 (defgroup perl-completion nil
   ""
   :group 'perl-completion)
+
+(defcustom plcmp-lib-directory-re "lib/"
+  "regexp, used in `plcmp--get-lib-path' to get library path.
+eg, when directory of buffer is \"~/someproject/lib/hoge.pm\" and this value is \"lib/\"
+set \"~/someproject/lib\" to PERL5LIB automatically during perl-completion's command invocation."
+    :group 'perl-completion)
+
+;;; log util
+(defvar plcmp-debug nil)
+(defvar plcmp-log-buf-name "*plcmp debug*")
+(defun plcmp-log-buf ()
+  (get-buffer-create plcmp-log-buf-name))
+(defsubst plcmp-log (&rest messages)
+  (ignore-errors
+    (when plcmp-debug
+      (require 'pp)
+      (let* ((str (or (ignore-errors (apply 'format messages))
+                      (pp-to-string (car messages))))
+             (strn (concat str "\n")))
+        (with-current-buffer (plcmp-log-buf)
+          (goto-char (point-max))
+          (insert strn))
+        str))))
+(defun plcmp-message (&rest args)
+  (when plcmp-debug
+    (prog1 (apply 'message args)
+      (apply 'plcmp-log args))))
+
 
 ;;; variables
@@ -59 +83 @@
                                          (regexp ,plcmp-perl-ident-re)))))
 
-(defvar plcmp-perl-package-re "[a-zA-Z:]+")
+(defvar plcmp-perl-package-re "[a-zA-Z_][a-zA-Z0-9_:]*")
 
 (defvar plcmp-builtin-functions
@@ -119 +143 @@
 (defvar plcmp--cached-variables nil "list of cached variable. each variable is cleared by `plcmp-cmd-clear-all-caches'")
 
+(defvar plcmp-clear-all-caches-hook nil
+  "hook run when invoke `plcmp-cmd-clear-all-caches'")
+
+
+;;; keymap
+(defvar plcmp-mode-map
+  (let ((map (make-sparse-keymap)))
+    ;; completion
+    (define-key map (kbd "C-RET") 'plcmp-cmd-smart-complete)
+    (define-key map (kbd "C-<return>") 'plcmp-cmd-smart-complete)
+    (define-key map (kbd "C-M-i") 'plcmp-cmd-smart-complete)
+    (define-key map (kbd "C-c a") 'plcmp-cmd-complete-arrays)
+    (define-key map (kbd "C-c i") 'plcmp-cmd-complete-modules)
+    (define-key map (kbd "C-c v") 'plcmp-cmd-complete-variables)
+    (define-key map (kbd "C-c f") 'plcmp-cmd-complete-functions)
+    (define-key map (kbd "C-c h") 'plcmp-cmd-complete-hashes)
+    (define-key map (kbd "C-c m") 'plcmp-cmd-complete-methods)
+    (define-key map (kbd "C-c C-c a") 'plcmp-cmd-complete-all)
+
+    ;; doc
+    (define-key map (kbd "C-c d") 'plcmp-cmd-show-doc)
+    (define-key map (kbd "C-c s") 'plcmp-cmd-show-doc-at-point)
+    (define-key map (kbd "C-c M") 'plcmp-cmd-menu)
+
+    ;; other
+    (define-key map (kbd "C-c c") 'plcmp-cmd-clear-all-caches)
+    (define-key map (kbd "C-c C-c s") 'plcmp-cmd-show-environment)
+    (define-key map (kbd "C-c C-c u") 'plcmp-cmd-update-check)
+    (define-key map (kbd "C-c C-c d") 'plcmp-cmd-set-additional-lib-directory)
+    
+    map))
+
+(defvar plcmp-anything-map
+  (let ((map (make-sparse-keymap)))
+      (define-key map (kbd "O") 'plcmp-acmd-occur)
+      (define-key map (kbd "D") 'plcmp-acmd-show-doc)
+      (define-key map (kbd "F") 'plcmp-acmd-open-related-file)
+      (define-key map (kbd "G") 'plcmp-acmd-goto-looking-point)
+      (define-key map (kbd "J") 'scroll-other-window)
+      (define-key map (kbd "K") 'scroll-other-window-down)
+      (define-key map (kbd "L") 'plcmp-acmd-persistent-look)      
+      (set-keymap-parent map anything-map)
+      
+      map))
+
 
 ;;; macros
@@ -125 +194 @@
 ;; idea: http://svn.coderepos.org/share/lang/elisp/set-perl5lib/set-perl5lib.el
 ;;       http://d.hatena.ne.jp/sun-basix/20080117/1200528765 (Japanese)
-; (buffer-file-name default-directory
-(defcustom plcmp-lib-directory-re "lib/"
-  "regexp, used in `plcmp--get-lib-path' to get library path.
-eg, when directory of buffer is \"~/someproject/lib/hoge.pm\" and this value is \"lib/\"
-set \"~/someproject/lib\" to PERL5LIB automatically during perl-completion's command invocation."
-    :group 'perl-completion)
-
 (defvar plcmp-additional-lib-directories nil
   "list of string(directory),each directory set to PERL5LIB during perl-completion's command invocation.
 this variable is buffer local") ;buffer local
 (make-variable-buffer-local 'plcmp-additional-lib-directories)
-
 
 
@@ -163 +224 @@
        (when additional-lib-list
          (let* ((additional-lib-str (mapconcat 'identity additional-lib-list path-separator))
-                (current-perl5lib (concat additional-lib-str path-separator old-perl5lib)))
+                (current-perl5lib (concat additional-lib-str path-separator old-perl5lib))
+                (current-perl5lib (replace-regexp-in-string ":$" "" current-perl5lib)))
            (when (and (stringp current-perl5lib)
                       (not (equal "" current-perl5lib)))
@@ -179 +241 @@
        (interactive)
        (unwind-protect
-           (plcmp-with-set-perl5-lib
-            (progn (plcmp-initialize-variables)
-                   ,@body))
+           (let ((anything-map plcmp-anything-map))
+             (plcmp-with-set-perl5-lib
+              (progn (plcmp-initialize-variables)
+                     ,@body)))
          (plcmp-cleanup)))))
 (put 'define-plcmp-command 'lisp-indent-function 'defun)
@@ -242 +305 @@
              (match-sources)
              (unmatch-sources)
-             (sorted-sources (loop for source in sources
-              if (plcmp--re-match-sources1 regexps source)
-              collect source into match-sources
-              else
-              collect source into unmatch-sources
-              finally return (if reverse
-                                 (nconc unmatch-sources match-sources)
-                               (nconc match-sources unmatch-sources)))))
-        (prog1 sorted-sources
-          (plcmp-log "plcmp-re-sort-sources: %s" sorted-sources)))
+             (sorted-sources
+              (loop for source in sources
+                    if (plcmp--re-match-sources1 regexps source)
+                    collect source into match-sources
+                    else
+                    collect source into unmatch-sources
+                    finally return (if reverse
+                                       (nconc unmatch-sources match-sources)
+                                     (nconc match-sources unmatch-sources)))))
+        sorted-sources)
     (error (plcmp-log "Error: plcmp-re-sort-sources\nregexps: %s\nsources: %s"
                       regexps
@@ -272 +335 @@
 
 
-;;; log
-(defvar plcmp-debug nil)
-(defvar plcmp-log-buf-name "*plcmp debug*")
-(defun plcmp-log-buf ()
-  (get-buffer-create plcmp-log-buf-name))
-(defun plcmp-log (&rest messages)
-  (ignore-errors
-    (when plcmp-debug
-      (require 'pp)
-      (let* ((str (or (ignore-errors (apply 'format messages))
-                      (pp-to-string (car messages))))
-             (strn (concat str "\n")))
-        (with-current-buffer (plcmp-log-buf)
-          (goto-char (point-max))
-          (insert strn))
-        str))))
-(defun plcmp-message (&rest args)
-  (when plcmp-debug
-    (prog1 (apply 'message args)
-      (apply 'plcmp-log args))))
-
-
+
+;;; initial-input
 (defvar plcmp-initial-input "")
 (defvar plcmp-real-initial-input "real initial-input if required `anything-match-plugin' initial-input is not real initial-input")
@@ -304 +347 @@
         (when (string-equal str "::")
           (buffer-substring-no-properties start (point)))))))
-          
+
 
 (defun plcmp-get-initial-real-input-list ()
@@ -376 +419 @@
 (defun plcmp--installed-modules-asynchronously ()
   "start process, set sentinel, return process."
-  (message "fetching installed modules...")
-  (let* ((command "find")
-         (args (concat "`perl -e 'pop @INC; print join(q{ }, @INC);'`"
-                       " -name '*.pm' -type f "
-                       "| xargs grep -E -h -o 'package [a-zA-Z0-9:]+;' "
-                       "| perl -nle 's/package\s+(.+);/$1/; print' "
-                       "| sort "
-                       "| uniq "))
-         (proc (start-process-shell-command "installed perl modules"
-                                            plcmp-installed-modules-buffer-name
-                                            command
-                                            args)))
-    (set-process-sentinel proc 'plcmp--installed-modules-set-cache)
-    ;; return process
-    proc))
+  (unless (plcmp-tramp-p)
+    (message "fetching installed modules...")
+    (with-current-buffer (get-buffer-create plcmp-installed-modules-buffer-name)
+      (erase-buffer))
+    (let* ((command "find")
+           (args (concat "`perl -e 'pop @INC; print join(q{ }, @INC);'`"
+                         " -name '*.pm' -type f "
+                         "| xargs grep -E -h -o 'package [a-zA-Z0-9:]+;' "
+                         "| perl -nle 's/package\s+(.+);/$1/; print' "
+                         "| sort "
+                         "| uniq "))
+           (proc (start-process-shell-command "installed perl modules"
+                                              plcmp-installed-modules-buffer-name
+                                              command
+                                              args)))
+      (set-process-sentinel proc 'plcmp--installed-modules-set-cache)
+      ;; return process
+      proc)))
 
 
@@ -412 +458 @@
 (defvar plcmp-using-modules nil)
 (defun plcmp-get-using-modules ()
-  (let ((re (rx-to-string `(and bol
-                                (* space)
-                                "use"
-                                (+ space)
-                                (group  ;1 package
-                                 (regexp ,plcmp-perl-package-re))
-                                (* not-newline)
-                                ";"))))
-    (plcmp-collect-matches re 1 'match-string-no-properties)))
+  (let ((re (rx-to-string ` (and bol
+                                 (* space)
+                                 "use"
+                                 (+ space)
+                                    (group  ;1 package
+                                     (regexp ,plcmp-perl-package-re))
+                                    (* not-newline)
+                                    ";")))
+        (require-re (rx-to-string `(and "require"
+                                        (+ space)
+                                        (group
+                                         (regexp ,plcmp-perl-package-re))))))
+    (nunion (plcmp-collect-matches re 1 'match-string-no-properties)
+            (delete-if-not (lambda (s)
+                             (member s plcmp-installed-modules))
+                           (plcmp-collect-matches require-re 1 'match-string-no-properties))
+            :test 'string-equal)))
 
 ;;; methods
@@ -468 +522 @@
     (and (stringp path)
          (file-exists-p path)
-         path)))
+         (expand-file-name path))))
 
 (defun plcmp--inspect-module-scrape (module-name)
@@ -486 +540 @@
     (message "getting methods %s ..." module-name)))
 
-
 (defvar plcmp-module-methods-alist nil
   "alist, (module-name . (list of methods))")
+(add-to-list 'plcmp--cached-variables 'plcmp-module-methods-alist)
+
+
 (defun plcmp-get-module-methods-alist (using-modules)
   (dolist (module-name using-modules plcmp-module-methods-alist)
@@ -499 +555 @@
 (defvar plcmp--mk-module-source-name " Methods")
 
-(defun plcmp--mk-module-source (module-name)
+(defsubst plcmp--mk-module-source (module-name)
   (anything-aif (assoc-default module-name plcmp-module-methods-alist)
       `((name . ,(concat module-name plcmp--mk-module-source-name))
@@ -523 +579 @@
                         (plcmp-open-module-file module-name 'pop-to-buffer))))
                    ("Open module file other frame" .
-                  (lambda (candidate)
-                    (let ((module-name (plcmp-get-current-module-name)))
-                      (plcmp-open-module-file module-name
-                                              'switch-to-buffer-other-frame))))
+                    (lambda (candidate)
+                      (let ((module-name (plcmp-get-current-module-name)))
+                        (plcmp-open-module-file module-name
+                                                'switch-to-buffer-other-frame))))
+                   ("Occur module file" .
+                    (lambda (candidate)
+                      (let ((module-name (plcmp-get-current-module-name)))
+                        (plcmp-open-module-file module-name
+                                                'switch-to-buffer)
+                        (funcall (plcmp-get-occur-fn)
+                                 candidate
+                                  nil))))
                    ("Add to kill-ring" . kill-new)
                    ("Insert source name" .
@@ -537 +601 @@
                   (with-current-buffer (anything-candidate-buffer 'global)
                     (plcmp-insert-each-line ',it))))
-        (candidates-in-buffer))))
+        (candidates-in-buffer)
+        (persistent-action . (lambda (candidate)
+                               (let ((module-name (plcmp-get-current-module-name)))
+                                 (plcmp-open-doc module-name)
+                                 (plcmp-re-search-forward-fontify (regexp-quote candidate)))))
+        )))
 
 
 ;; plcmp-using-modules -> sources
-(defun plcmp-get-methods-completion-sources (using-modules)
+(defun plcmp-get-sources-methods (using-modules)
   (loop for module-name in using-modules
         collect (plcmp--mk-module-source module-name)))
@@ -564 +633 @@
 (defsubst* plcmp-get-face-words (&optional (faces '(font-lock-variable-name-face
                                                     font-lock-function-name-face)))
-  (let ((hash (make-hash-table :test 'equal)))
+  (let ((hash (make-hash-table :test 'equal))
+        (ret nil))
     (save-excursion
       (loop initially (goto-char (point-min))
@@ -574 +644 @@
                             (puthash it nil hash)))
                       (goto-char next-change)))
-      (let ((ret))
-        (maphash (lambda (k v) (push k ret)) hash) ; remove-dups
-        ret))))
-
-(defvar plcmp-current-buffer-words-alist nil
-  "alist, ((variable . (list of variables))
- (array . (list of arrays))
- (hash . (list of hashes))
- (functions . (list of functions)))")
-(add-hook 'plcmp--command-cleanup-hook
-          (lambda ()
-            (setq plcmp-current-buffer-words-alist nil)))
-
-
-(defun plcmp-get-current-buffer-words-alist ()
-  (or plcmp-current-buffer-words-alist
-      (let ((variables (plcmp-get-face-words '(font-lock-variable-name-face)))
-            (arrays (plcmp-get-face-words '(cperl-array-face)))
-            (hashes (plcmp-get-face-words '(cperl-hash-face)))
-            (functions (plcmp-get-buffer-subs)))
-        (setq plcmp-current-buffer-words-alist
-              `((variable . ,variables)
-                (array . ,arrays)
-                (hash . ,hashes)
-                (function . ,functions))))))
-
-(defun plcmp-get-current-buffer-variables ()
-  (let ((alist (plcmp-get-current-buffer-words-alist)))
-    (prog1 (assoc-default 'variable alist 'eq)
-      (plcmp-log "getting current buffer variables"))))
-
-(defvar plcmp-anything-source-completion-current-buffer-variables
-  `((name . "buffer variables")
-    (type . plcmp-completion)
-    (init . (lambda ()
-              (let ((words (plcmp-get-current-buffer-variables)))
-                (with-current-buffer (anything-candidate-buffer 'global)
-                  (plcmp-insert-each-line words)))))
-    (candidates-in-buffer)))
-
-(defun plcmp-get-current-buffer-arrays ()
-  (let ((alist (plcmp-get-current-buffer-words-alist)))
-    (prog1 (assoc-default 'array alist 'eq)
-      (plcmp-log "getting current buffer arrays"))))
-
-(defvar plcmp-anything-source-completion-current-buffer-arrays
-  `((name . "buffer arrays")
-    (type . plcmp-completion)
-    (init . (lambda ()
-              (let ((words (plcmp-get-current-buffer-arrays)))
-                (with-current-buffer (anything-candidate-buffer 'global)
-                  (plcmp-insert-each-line words)))))
-    (candidates-in-buffer)))
-
-(defun plcmp-get-current-buffer-hashes ()
-  (let ((alist (plcmp-get-current-buffer-words-alist)))
-    (prog1 (assoc-default 'hash alist 'eq)
-      (plcmp-log "getting current buffer hashes"))))
-
-(defvar plcmp-anything-source-completion-current-buffer-hashes
-  `((name . "buffer hashes")
-    (type . plcmp-completion)
-    (init . (lambda ()
-              (let ((words (plcmp-get-current-buffer-hashes)))
-                (with-current-buffer (anything-candidate-buffer 'global)
-                  (plcmp-insert-each-line words)))))
-    (candidates-in-buffer)))
-
-(defun plcmp-get-current-buffer-functions ()
-  (let ((alist (plcmp-get-current-buffer-words-alist)))
-    (prog1 (assoc-default 'function alist 'eq)
-      (plcmp-log "getting current buffer functions"))))
-
-(defvar plcmp-anything-source-completion-current-buffer-functions
-  `((name . "buffer functions")
-    (type . plcmp-completion)
-    (init . (lambda ()
-              (let ((words (plcmp-get-current-buffer-functions)))
-                (with-current-buffer (anything-candidate-buffer 'global)
-                  (plcmp-insert-each-line words)))))
-    (candidates-in-buffer)))
-
+      (maphash (lambda (k v) (push k ret)) hash) ; remove-dups
+      (nreverse ret))))
 
 ;;; other buffer words
@@ -669 +659 @@
     cperl-hash-face))
 
-(defun plcmp-get-other-perl-buffers-words ()
-  (let* ((perl-buffers (remove-if-not (lambda (buf)
-                                       (string-match plcmp-perl-buffer-re (buffer-name buf)))
-                                     (buffer-list)))
-         (perl-buffers (subseq perl-buffers 0 plcmp-other-perl-buffer-limit-number)))
-    (prog1 (loop for buffer in perl-buffers
-                 when (bufferp buffer)
-                 nconc (with-current-buffer buffer
-                         (plcmp-get-face-words plcmp-other-perl-buffers-words-faces)))
-      (plcmp-log "length of other perl-buffers: %s" (length perl-buffers)))))
-
+;; cache
+(defvar plcmp-buffer-tick-hash (make-hash-table :test 'equal))
+(defun* plcmp-buffer-is-modified (&optional (buffer (current-buffer)))
+  "Return non-nil when BUFFER is modified since `anything' was invoked."
+  (let* ((key (concat (buffer-name buffer)
+                      "/"
+                      (anything-attr 'name)))
+         (source-tick (or (gethash key plcmp-buffer-tick-hash) 0))
+         (buffer-tick (buffer-chars-modified-tick buffer)))
+    (prog1 (/= source-tick buffer-tick)
+      (puthash key buffer-tick plcmp-buffer-tick-hash)
+      (plcmp-log "plcmp-buffer-is-modified")
+      (plcmp-log "current-buffer: %s" buffer)
+      (plcmp-log "source-tick: %s\nbuffer-tick: %s" source-tick buffer-tick))))
+
+
+(defvar plcmp-other-perl-buffers-cache-hash (make-hash-table :test 'equal))
+(add-hook 'plcmp-clear-all-caches-hook
+          (lambda ()
+            (setq plcmp-other-perl-buffers-cache-hash
+                  (make-hash-table :test 'equal))))
+
+(defun plcmp-add-to-other-perl-buffers-cache-hash (source-name faces buffer-name)
+  (let ((hash (or (gethash source-name plcmp-other-perl-buffers-cache-hash)
+                  (puthash source-name
+                           (make-hash-table :test 'equal)
+                           plcmp-other-perl-buffers-cache-hash)))
+        (words (plcmp-get-face-words faces)))
+    (assert (hash-table-p hash))
+    (puthash buffer-name
+             words
+             hash)
+    (prog1 words
+      (plcmp-log "\nplcmp-add-to-other-perl-buffers-cache-hash: %s"
+                 words))))
+
+(defun plcmp-get-other-perl-buffers-cache (source-name buffer-name)
+  "return los or nil if not cache ready"
+  (let ((hash (gethash source-name plcmp-other-perl-buffers-cache-hash)))
+    (and (hash-table-p hash)
+         (prog1 (gethash buffer-name hash)
+           (plcmp-log "plcmp-get-other-perl-buffers-cache: %s"
+                      (gethash buffer-name hash))))))
+
+(defun plcmp-other-perl-buffers-get-buffer-name ()
+  "return buffer or nil"
+  (let ((source-name (anything-attr 'name)))
+    (when (string-match (rx " *" (group (* not-newline)) "*" eol)
+                        source-name)
+      (let ((buffer-name (match-string 1 source-name)))
+        (when (stringp buffer-name)
+          (let ((buffer (get-buffer buffer-name)))
+            (and (bufferp buffer)
+                 buffer)))))))
+
+(defun plcmp-other-perl-buffers-action-open-related-buffer (candidate)
+  (let ((buffer (plcmp-other-perl-buffers-get-buffer-name)))
+    (switch-to-buffer buffer)))
+
+(defun plcmp-other-perl-buffers-action-occur (candidate)
+  (let ((buffer (plcmp-other-perl-buffers-get-buffer-name)))
+    (switch-to-buffer buffer)
+    (funcall (plcmp-get-occur-fn)
+             (regexp-quote candidate)
+             nil)))
 
 (defun plcmp--mk-other-perl-buffer-source (source-name faces buffer-name)
   `((name . ,(concat source-name " *" buffer-name "*"))
-    (action . (("Insert" . plcmp-insert)))
+    (action . (("Insert" . plcmp-insert)
+               ("Open related buffer" . plcmp-other-perl-buffers-action-open-related-buffer)
+               ("Occur" . plcmp-other-perl-buffers-action-occur)))
     (init . (lambda ()
               (let ((words (with-current-buffer (get-buffer ,buffer-name)
-                             (plcmp-get-face-words ',faces))))
+                             (anything-aif (and (not (plcmp-buffer-is-modified))
+                                                (plcmp-get-other-perl-buffers-cache ,source-name ,buffer-name))
+                                 (prog1 it
+                                   (plcmp-log "return cache buffer: %s source-name: %s "
+                                              ,buffer-name
+                                              ,source-name))
+                               (prog1 (plcmp-add-to-other-perl-buffers-cache-hash
+                                       ,source-name
+                                       ',faces
+                                       ,buffer-name)
+                                 (plcmp-log "modified: %s" ,buffer-name))))))
                 (with-current-buffer (anything-candidate-buffer 'global)
                   (plcmp-insert-each-line words)))))
-    (candidates-in-buffer)))
+    (candidates-in-buffer)
+    (persistent-action . (lambda (candidate)
+                           (let ((buffer (plcmp-other-perl-buffers-get-buffer-name)))
+                             (when (bufferp buffer)
+                               (switch-to-buffer buffer)
+                               (plcmp-re-search-forward-fontify (regexp-quote candidate))))))
+    ))
 
 (defun plcmp--sources-other-perl-buffers (source-name faces)
@@ -706 +768 @@
       (plcmp-log "plcmp--sources-other-perl-buffers:")
       (plcmp-log sources))))
-    
+
+(defun plcmp-get-sources-other-perl-buffers-words ()
+  (plcmp--sources-other-perl-buffers "words" plcmp-other-perl-buffers-words-faces))
+
 (defun plcmp-get-sources-other-perl-buffers-variable ()
   (plcmp--sources-other-perl-buffers "variables" '(font-lock-variable-name-face)))
@@ -738 +803 @@
 ;;;; Document
 ;;;; %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-(defvar plcmp-doc-overlay nil "overlay")
-(defvar plcmp-doc-current-point nil)
+(defvar plcmp-look-overlay nil "overlay")
 (add-hook 'plcmp--command-cleanup-hook
           (lambda ()
-            (setq plcmp-doc-current-point nil)))
+            (when (overlayp plcmp-look-overlay)
+              (delete-overlay plcmp-look-overlay))))
+
+(defvar plcmp-look-current-positions nil
+  "list of (point buffer)
+point, after `plcmp-re-search-forward-fontify'")
+(add-hook 'plcmp--command-cleanup-hook
+          (lambda ()
+            (setq plcmp-look-current-positions nil)))
 
 (defun plcmp-re-search-forward-fontify (regexp)
-  (when (re-search-forward regexp nil t)
-    (let ((beg (match-beginning 1))
-          (end (match-end 1)))
-      ;; remember point
-      (setq plcmp-doc-current-point (point))
+  (if (re-search-forward regexp nil t)
+      (let ((beg (match-beginning 0))
+            (end (match-end 0)))
+        ;; remember positions
+        (setq plcmp-look-current-positions (list (point) (current-buffer)))
+        (plcmp-log "plcmp-look-current-positions: %s" (list (point) (current-buffer)))
       
-      (when (and beg end)
-        (if (overlayp plcmp-doc-overlay)
-            (move-overlay plcmp-doc-overlay beg end (current-buffer))
-          (setq plcmp-doc-overlay (make-overlay beg end)))
-        (overlay-put plcmp-doc-overlay 'face 'highlight)))))
-
+        (when (and beg end)
+          (if (overlayp plcmp-look-overlay)
+              (move-overlay plcmp-look-overlay beg end (current-buffer))
+            (setq plcmp-look-overlay (make-overlay beg end)))
+          (overlay-put plcmp-look-overlay 'face 'highlight)
+          (recenter 5)))
+    (goto-char (point-min))))
 
 
@@ -767 +841 @@
         plcmp-using-modules (plcmp-get-using-modules)
         plcmp-module-methods-alist (plcmp-get-module-methods-alist plcmp-using-modules)
-        plcmp-obj-instance-of-module-maybe-alist (plcmp-get-obj-instance-of-module-maybe-alist plcmp-using-modules)
-        )
+        plcmp-obj-instance-of-module-maybe-alist (plcmp-get-obj-instance-of-module-maybe-alist plcmp-using-modules))
   (multiple-value-setq
       (plcmp-initial-input plcmp-real-initial-input) (plcmp-get-initial-real-input-list)))