コミット: 5e7152e0ebbc3d3885d070b1856df417578dda9f - emacs (git)

コミットメタ情報

• リビジョン: 5e7152e0ebbc3d3885d070b1856df417578dda9f (tree)
• 日時: 2023-05-04 22:14:40
• 作者: badcoff33 <none@none>
• コミッター: badcoff33

ログメッセージ

move navigator code to find-in-files

変更サマリ

• modified: elisp/autoloads-elisp.el
• modified: elisp/find-in-files.el
• delete: elisp/navigator.el

差分

--- a/elisp/autoloads-elisp.el
+++ b/elisp/autoloads-elisp.el
@@ -98,9 +98,9 @@ case the buffer is modofied, the buffer will not be reverted." t nil)
 ;;; Generated autoloads from find-in-files.el
 
 (autoload '+find-any-file "find-in-files" "\
-Find a file in root directory. The root directory is evaluatd by
-function `+utils-find-root-dir'. When called with prefix, the
-`default-directoy' is used. 
+Find rekursive any file matching glob pattern *.* in root
+directory. Root directory is determined by `+utils-find-root-dir'.
+When called with prefix, the root directory is requested first. 
 
 \(fn &optional PREFIX)" t nil)
 
@@ -125,34 +125,29 @@ relative to project's root dir.
 
 \(fn &optional PREFIX)" t nil)
 
-(register-definition-prefixes "find-in-files" '("+find-in-files-" "fif-all-options"))
-
-;;;***
-
-;;;### (autoloads nil "navigator" "navigator.el" (0 0 0 0))
-;;; Generated autoloads from navigator.el
-
-(autoload '+find-file-in-tag-files "navigator" "\
+(autoload '+find-file-in-tag-files "find-in-files" "\
 An method to open a file, that is listed in the visited
 tags file." t nil)
 
-(autoload '+store-last-insertation-point "navigator" "\
+(autoload '+store-last-insertation-point "find-in-files" "\
 Store in `go-back-marker' last point where
 `self-insert-command' was called. Function shall be called by
 `after-change-functions'.
 
 \(fn BEG END LEN)" nil nil)
 
-(autoload '+go-back-to-last-insertion-point "navigator" "\
+(autoload '+go-back-to-last-insertion-point "find-in-files" "\
 Go back to point of the last text insertion. No stack of
 insertation points implemented (dumb and simple). The
 point-marker is stored in a variable `go-back-marker'." t nil)
 
-(autoload '+show-dir-info "navigator" "\
+(autoload '+show-dir-info "find-in-files" "\
 
 
 \(fn &optional PREFIX)" t nil)
 
+(register-definition-prefixes "find-in-files" '("+find-in-files-" "fif-all-options"))
+
 ;;;***
 
 ;;;### (autoloads nil "skeletons" "skeletons.el" (0 0 0 0))

--- a/elisp/find-in-files.el
+++ b/elisp/find-in-files.el
@@ -190,5 +190,60 @@ relative to project's root dir."
     (grep fif-command)
     (add-to-list '+find-in-files-history fif-command)))
 
+;;;###autoload
+(defun +find-file-in-tag-files ()
+  "An method to open a file, that is listed in the visited
+tags file."
+  (interactive)
+  (save-excursion
+    (let* ((all-files nil))
+      (visit-tags-table-buffer nil)
+      (setq all-files (tags-table-files))
+      (while (visit-tags-table-buffer t)
+        (setq all-files (append all-files (tags-table-files))))
+          (find-file
+           (expand-file-name
+        (completing-read "Open file: " all-files nil t))))))
+
+;;;###autoload
+(defun +store-last-insertation-point (beg end len)
+  "Store in `go-back-marker' last point where
+`self-insert-command' was called. Function shall be called by
+`after-change-functions'."
+  (when buffer-file-name
+        (when (not (equal "TAGS" (upcase (file-name-nondirectory buffer-file-name))))
+          (setq go-back-marker (point-marker)))))
+
+;;;###autoload
+(defun +go-back-to-last-insertion-point ()
+  "Go back to point of the last text insertion. No stack of
+insertation points implemented (dumb and simple). The
+point-marker is stored in a variable `go-back-marker'."
+  (interactive)
+  (when (boundp 'go-back-marker)
+        (switch-to-buffer (marker-buffer go-back-marker))
+        (goto-char (marker-position go-back-marker))))
+
+;;;###autoload
+(defun +show-dir-info (&optional prefix)
+  (interactive "P")
+  (let* ((help-window-select t))
+    (if (not prefix)
+        (message (if (buffer-file-name)
+                     (format-message "buffer's file '%s'" (expand-file-name (buffer-file-name)))
+                   "buffer has no file"))
+      (with-help-window
+          "*buffer-info*"
+        '(display-buffer-same-window) nil
+        (progn
+          (princ (format-message "buffer file name: %s\n" (or (buffer-file-name) "NO FILE")))
+          (princ (format "default directory: %s\n" (file-name-as-directory default-directory)))
+          (princ (format "desktop directory: %s\n" (file-name-as-directory desktop-dirname)))
+          (princ (format "project root: %s\n" (or (locate-dominating-file default-directory dir-locals-file) "none")))
+          (if tags-table-list
+              (dolist (tf tags-table-list)
+                (princ (format "visited tag file: %s" tf)))
+            (princ "visited tag file: NONE")))))))
+
 (provide 'find-in-files)
 ;;; find-in-files.el ends here

--- a/elisp/navigator.el
+++ /dev/null
@@ -1,84 +0,0 @@
-;;; navigator.el --- functions to give a better edit experience
-
-;; Copyright (C) 2022 Markus
-
-;; Author: Markus <[e-mail]>
-;; Keywords: elisp support
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Some work to be done ....
-
-;;; Code:
-
-;;;###autoload
-(defun +find-file-in-tag-files ()
-  "An method to open a file, that is listed in the visited
-tags file."
-  (interactive)
-  (save-excursion
-    (let* ((all-files nil))
-      (visit-tags-table-buffer nil)
-      (setq all-files (tags-table-files))
-      (while (visit-tags-table-buffer t)
-        (setq all-files (append all-files (tags-table-files))))
-          (find-file
-           (expand-file-name
-        (completing-read "Open file: " all-files nil t))))))
-
-;;;###autoload
-(defun +store-last-insertation-point (beg end len)
-  "Store in `go-back-marker' last point where
-`self-insert-command' was called. Function shall be called by
-`after-change-functions'."
-  (when buffer-file-name
-        (when (not (equal "TAGS" (upcase (file-name-nondirectory buffer-file-name))))
-          (setq go-back-marker (point-marker)))))
-
-;;;###autoload
-(defun +go-back-to-last-insertion-point ()
-  "Go back to point of the last text insertion. No stack of
-insertation points implemented (dumb and simple). The
-point-marker is stored in a variable `go-back-marker'."
-  (interactive)
-  (when (boundp 'go-back-marker)
-        (switch-to-buffer (marker-buffer go-back-marker))
-        (goto-char (marker-position go-back-marker))))
-
-;;;###autoload
-(defun +show-dir-info (&optional prefix)
-  (interactive "P")
-  (let* ((help-window-select t))
-    (if (not prefix)
-        (message (if (buffer-file-name)
-                     (format-message "buffer's file '%s'" (expand-file-name (buffer-file-name)))
-                   "buffer has no file"))
-      (with-help-window
-          "*buffer-info*"
-        '(display-buffer-same-window) nil
-        (progn
-          (princ (format-message "buffer file name: %s\n" (or (buffer-file-name) "NO FILE")))
-          (princ (format "default directory: %s\n" (file-name-as-directory default-directory)))
-          (princ (format "desktop directory: %s\n" (file-name-as-directory desktop-dirname)))
-          (princ (format "project root: %s\n" (or (locate-dominating-file default-directory dir-locals-file) "none")))
-          (if tags-table-list
-              (dolist (tf tags-table-list)
-                (princ (format "visited tag file: %s" tf)))
-            (princ "visited tag file: NONE")))))))
-
-(provide 'navigator)
-
-;;; navigator.el ends here