From cb624b9d1a682a4cf5737063c45482939ff727db Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 21 Dec 2024 17:38:29 +0100 Subject: [PATCH] update dired-narrow Signed-off-by: Andreas Gerler --- .../dired-narrow-pkg.el | 14 ------- .../dired-narrow-autoloads.el | 33 ++++++++-------- .../dired-narrow-pkg.el | 12 ++++++ .../dired-narrow.el | 27 ++++++++----- elpa/dired-narrow-readme.txt | 38 ------------------- 5 files changed, 45 insertions(+), 79 deletions(-) delete mode 100644 elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el rename elpa/{dired-narrow-20230512.1107 => dired-narrow-20240629.1953}/dired-narrow-autoloads.el (66%) create mode 100644 elpa/dired-narrow-20240629.1953/dired-narrow-pkg.el rename elpa/{dired-narrow-20230512.1107 => dired-narrow-20240629.1953}/dired-narrow.el (95%) delete mode 100644 elpa/dired-narrow-readme.txt diff --git a/elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el b/elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el deleted file mode 100644 index 7a3f4177..00000000 --- a/elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el +++ /dev/null @@ -1,14 +0,0 @@ -(define-package "dired-narrow" "20230512.1107" "Live-narrowing of search results for dired" - '((dash "2.7.0") - (dired-hacks-utils "0.0.1")) - :commit "523f51b4152a3bf4e60fe57f512732c698b5c96f" :authors - '(("Matúš Goljer" . "matus.goljer@gmail.com")) - :maintainers - '(("Matúš Goljer" . "matus.goljer@gmail.com")) - :maintainer - '("Matúš Goljer" . "matus.goljer@gmail.com") - :keywords - '("files")) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/dired-narrow-20230512.1107/dired-narrow-autoloads.el b/elpa/dired-narrow-20240629.1953/dired-narrow-autoloads.el similarity index 66% rename from elpa/dired-narrow-20230512.1107/dired-narrow-autoloads.el rename to elpa/dired-narrow-20240629.1953/dired-narrow-autoloads.el index e0eafb85..7d06039a 100644 --- a/elpa/dired-narrow-20230512.1107/dired-narrow-autoloads.el +++ b/elpa/dired-narrow-20240629.1953/dired-narrow-autoloads.el @@ -1,17 +1,18 @@ -;;; dired-narrow-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; dired-narrow-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "dired-narrow" "dired-narrow.el" (0 0 0 0)) ;;; Generated autoloads from dired-narrow.el (autoload 'dired-narrow-regexp "dired-narrow" "\ -Narrow a dired buffer to the files matching a regular expression." t nil) - +Narrow a dired buffer to the files matching a regular expression." t) (autoload 'dired-narrow "dired-narrow" "\ Narrow a dired buffer to the files matching a string. @@ -19,27 +20,25 @@ If the string contains spaces, then each word is matched against the file name separately. To succeed, all of them have to match but the order does not matter. -For example \"foo bar\" matches filename \"bar-and-foo.el\"." t nil) - +For example \"foo bar\" matches filename \"bar-and-foo.el\"." t) (autoload 'dired-narrow-fuzzy "dired-narrow" "\ Narrow a dired buffer to the files matching a fuzzy string. A fuzzy string is constructed from the filter string by inserting \".*\" between each letter. This is then matched as regular -expression against the file name." t nil) - +expression against the file name." t) (register-definition-prefixes "dired-narrow" '("dired-narrow-")) - -;;;*** -;;;### (autoloads nil nil ("dired-narrow-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'dired-narrow-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; dired-narrow-autoloads.el ends here diff --git a/elpa/dired-narrow-20240629.1953/dired-narrow-pkg.el b/elpa/dired-narrow-20240629.1953/dired-narrow-pkg.el new file mode 100644 index 00000000..24aa5f47 --- /dev/null +++ b/elpa/dired-narrow-20240629.1953/dired-narrow-pkg.el @@ -0,0 +1,12 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "dired-narrow" "20240629.1953" + "Live-narrowing of search results for dired." + '((dash "2.7.0") + (dired-hacks-utils "0.0.1") + (emacs "24")) + :url "https://github.com/Fuco1/dired-hacks" + :commit "e9e408e8571aee5574ca0a431ef15cac5a3585d4" + :revdesc "e9e408e8571a" + :keywords '("files") + :authors '(("Matúš Goljer" . "matus.goljer@gmail.com")) + :maintainers '(("Matúš Goljer" . "matus.goljer@gmail.com"))) diff --git a/elpa/dired-narrow-20230512.1107/dired-narrow.el b/elpa/dired-narrow-20240629.1953/dired-narrow.el similarity index 95% rename from elpa/dired-narrow-20230512.1107/dired-narrow.el rename to elpa/dired-narrow-20240629.1953/dired-narrow.el index e041ab57..7736192c 100644 --- a/elpa/dired-narrow-20230512.1107/dired-narrow.el +++ b/elpa/dired-narrow-20240629.1953/dired-narrow.el @@ -4,10 +4,12 @@ ;; Author: Matúš Goljer ;; Maintainer: Matúš Goljer -;; Version: 0.0.1 +;; Package-Version: 20240629.1953 +;; Package-Revision: e9e408e8571a ;; Created: 14th February 2014 -;; Package-Requires: ((dash "2.7.0") (dired-hacks-utils "0.0.1")) +;; Package-Requires: ((dash "2.7.0") (dired-hacks-utils "0.0.1") (emacs "24")) ;; Keywords: files +;; URL: https://github.com/Fuco1/dired-hacks ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License @@ -95,8 +97,10 @@ Function takes no argument and is called with point over the file we should act on." - :type '(choice (const :tag "Open file under point" dired-narrow-find-file) - (function :tag "Use custom function.")) + :type '(choice + (const :tag "Do nothing" ignore) + (const :tag "Open file under point" dired-narrow-find-file) + (function :tag "Use custom function")) :group 'dired-narrow) (defcustom dired-narrow-exit-when-one-left nil @@ -147,7 +151,8 @@ when `dired-narrow-exit-when-one-left' and `dired-narrow-enable-blinking' are tr (defun dired-narrow--update (filter) "Make the files not matching the FILTER invisible. - Return the count of visible files that are left after update." + +Return the count of visible files that are left after update." (let ((inhibit-read-only t) (visible-files-cnt 0)) @@ -258,13 +263,15 @@ read from minibuffer." (unless disable-narrow (dired-narrow-mode -1)) (remove-from-invisibility-spec :dired-narrow) (dired-narrow--restore)) - (when (and disable-narrow - dired-narrow--current-file - dired-narrow-exit-action) - (funcall dired-narrow-exit-action)) (cond ((equal disable-narrow "dired-narrow-enter-directory") - (dired-narrow--internal filter-function)))))) + (dired-narrow-find-file) + (dired-narrow--internal filter-function)) + (t + (when (and disable-narrow + dired-narrow--current-file + dired-narrow-exit-action) + (funcall dired-narrow-exit-action))))))) ;; Interactive diff --git a/elpa/dired-narrow-readme.txt b/elpa/dired-narrow-readme.txt deleted file mode 100644 index 5d03f72b..00000000 --- a/elpa/dired-narrow-readme.txt +++ /dev/null @@ -1,38 +0,0 @@ -This package provides live filtering of files in dired buffers. In -general, after calling the respective narrowing function you type a -filter string into the minibuffer. After each change the changes -automatically reflect in the buffer. Typing C-g will cancel the -narrowing and restore the original view, typing RET will exit the -live filtering mode and leave the dired buffer in the narrowed -state. To bring it back to the original view, you can call -`revert-buffer' (usually bound to `g'). - -During the filtering process, several special functions are -available. You can customize the binding by changing -`dired-narrow-map'. - -* `dired-narrow-next-file' () - move the point to the next file -* `dired-narrow-previous-file' () - move the point to the - previous file -* `dired-narrow-enter-directory' () - descend into the - directory under point and immediately go back to narrowing mode - -You can customize what happens after exiting the live filtering -mode by customizing `dired-narrow-exit-action'. - -These narrowing functions are provided: - -* `dired-narrow' -* `dired-narrow-regexp' -* `dired-narrow-fuzzy' - -You can also create your own narrowing functions quite easily. To -define new narrowing function, use `dired-narrow--internal' and -pass it an apropriate filter. The filter should take one argument -which is the filter string from the minibuffer. It is then called -at each line that describes a file with point at the beginning of -the file name. If the filter returns nil, the file is removed from -the view. As an inspiration, look at the built-in functions -mentioned above. - -See https://github.com/Fuco1/dired-hacks for the entire collection. -- 2.47.3