From 9fdc4a0ee828ab1c0a99b4b4fe74a7f0465e78f7 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 23 Nov 2023 19:57:09 +0100 Subject: [PATCH] update dired Signed-off-by: Andreas Gerler --- .../dired-hacks-utils-autoloads.el | 16 ---- .../dired-hacks-utils-pkg.el | 2 - .../dired-hacks-utils-autoloads.el | 27 +++++++ .../dired-hacks-utils-pkg.el | 13 ++++ .../dired-hacks-utils.el | 11 ++- .../dired-narrow-pkg.el | 2 - .../dired-narrow-autoloads.el | 18 ++--- .../dired-narrow-pkg.el | 14 ++++ .../dired-narrow.el | 21 ++++-- elpa/direx-20170422.1327/direx-pkg.el | 9 --- .../direx-autoloads.el | 26 ++----- elpa/direx-20230409.1425/direx-pkg.el | 11 +++ .../direx-project.el | 2 +- .../direx.el | 75 ++++++++----------- 14 files changed, 132 insertions(+), 115 deletions(-) delete mode 100644 elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-autoloads.el delete mode 100644 elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-pkg.el create mode 100644 elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-autoloads.el create mode 100644 elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-pkg.el rename elpa/{dired-hacks-utils-20190522.950 => dired-hacks-utils-20230512.1107}/dired-hacks-utils.el (97%) delete mode 100644 elpa/dired-narrow-20181114.1723/dired-narrow-pkg.el rename elpa/{dired-narrow-20181114.1723 => dired-narrow-20230512.1107}/dired-narrow-autoloads.el (79%) create mode 100644 elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el rename elpa/{dired-narrow-20181114.1723 => dired-narrow-20230512.1107}/dired-narrow.el (94%) delete mode 100644 elpa/direx-20170422.1327/direx-pkg.el rename elpa/{direx-20170422.1327 => direx-20230409.1425}/direx-autoloads.el (55%) create mode 100644 elpa/direx-20230409.1425/direx-pkg.el rename elpa/{direx-20170422.1327 => direx-20230409.1425}/direx-project.el (97%) rename elpa/{direx-20170422.1327 => direx-20230409.1425}/direx.el (94%) diff --git a/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-autoloads.el b/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-autoloads.el deleted file mode 100644 index cc077296..00000000 --- a/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-autoloads.el +++ /dev/null @@ -1,16 +0,0 @@ -;;; dired-hacks-utils-autoloads.el --- automatically extracted autoloads -;; -;;; Code: -(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) - -;;;### (autoloads nil nil ("dired-hacks-utils.el") (23994 46776 937195 -;;;;;; 494000)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; End: -;;; dired-hacks-utils-autoloads.el ends here diff --git a/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-pkg.el b/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-pkg.el deleted file mode 100644 index b14d0108..00000000 --- a/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "dired-hacks-utils" "20190522.950" "Utilities and helpers for dired-hacks collection" '((dash "2.5.0")) :commit "ae39981d7cc58206cfeb377d6621bdd9000fd472" :keywords '("files") :authors '(("Matúš Goljer" . "matus.goljer@gmail.com")) :maintainer '("Matúš Goljer" . "matus.goljer@gmail.com")) diff --git a/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-autoloads.el b/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-autoloads.el new file mode 100644 index 00000000..08ba947a --- /dev/null +++ b/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-autoloads.el @@ -0,0 +1,27 @@ +;;; dired-hacks-utils-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- +;; +;;; Code: + +(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path)))) + + +;;;### (autoloads nil "dired-hacks-utils" "dired-hacks-utils.el" +;;;;;; (0 0 0 0)) +;;; Generated autoloads from dired-hacks-utils.el + +(register-definition-prefixes "dired-hacks-utils" '("dired-")) + +;;;*** + +;;;### (autoloads nil nil ("dired-hacks-utils-pkg.el") (0 0 0 0)) + +;;;*** + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; coding: utf-8 +;; End: +;;; dired-hacks-utils-autoloads.el ends here diff --git a/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-pkg.el b/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-pkg.el new file mode 100644 index 00000000..9ecc4c98 --- /dev/null +++ b/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils-pkg.el @@ -0,0 +1,13 @@ +(define-package "dired-hacks-utils" "20230512.1107" "Utilities and helpers for dired-hacks collection" + '((dash "2.5.0")) + :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-hacks-utils-20190522.950/dired-hacks-utils.el b/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils.el similarity index 97% rename from elpa/dired-hacks-utils-20190522.950/dired-hacks-utils.el rename to elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils.el index 18bacecb..d283312f 100644 --- a/elpa/dired-hacks-utils-20190522.950/dired-hacks-utils.el +++ b/elpa/dired-hacks-utils-20230512.1107/dired-hacks-utils.el @@ -5,10 +5,9 @@ ;; Author: Matúš Goljer ;; Maintainer: Matúš Goljer ;; Keywords: files -;; Package-Version: 20190522.950 ;; Version: 0.0.1 ;; Created: 14th February 2014 -;; Package-requires: ((dash "2.5.0")) +;; Package-Requires: ((dash "2.5.0")) ;; 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 @@ -48,11 +47,11 @@ :group 'dired :prefix "dired-hacks-") -(defcustom dired-hacks-file-size-formatter 'file-size-human-readable +(defcustom dired-hacks-file-size-formatter #'file-size-human-readable "The function used to format file sizes. See `dired-utils-format-file-sizes'." - :type 'symbol + :type 'function :group 'dired-hacks) (defcustom dired-hacks-datetime-regexp @@ -66,7 +65,7 @@ followed by at least one space character. You should only use shy groups (prefixed with ?:) because the first group is used by the font-lock to determine what portion of the name should be colored." - :type 'string + :type 'regexp :group 'dired-hacks) (defalias 'dired-utils--string-trim @@ -182,7 +181,7 @@ Each car in ALIST is a string representing file extension (forward-line) (let ((inhibit-read-only t) (limit (line-end-position))) - (while (re-search-forward "\\(?:directory\\|available\\) \\(\\<[0-9]+\\>\\)" nil t) + (while (re-search-forward "\\(?:directory\\|available\\) \\(\\<[0-9]+$\\>\\)" nil t) (replace-match (save-match-data (propertize (dired-utils--string-trim diff --git a/elpa/dired-narrow-20181114.1723/dired-narrow-pkg.el b/elpa/dired-narrow-20181114.1723/dired-narrow-pkg.el deleted file mode 100644 index f40be819..00000000 --- a/elpa/dired-narrow-20181114.1723/dired-narrow-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; -*- no-byte-compile: t -*- -(define-package "dired-narrow" "20181114.1723" "Live-narrowing of search results for dired" '((dash "2.7.0") (dired-hacks-utils "0.0.1")) :commit "c7184dc8f6ed3f2330db8d8f21f01c4b08056dd3" :keywords '("files") :authors '(("Matúš Goljer" . "matus.goljer@gmail.com")) :maintainer '("Matúš Goljer" . "matus.goljer@gmail.com")) diff --git a/elpa/dired-narrow-20181114.1723/dired-narrow-autoloads.el b/elpa/dired-narrow-20230512.1107/dired-narrow-autoloads.el similarity index 79% rename from elpa/dired-narrow-20181114.1723/dired-narrow-autoloads.el rename to elpa/dired-narrow-20230512.1107/dired-narrow-autoloads.el index 6fdc2793..e0eafb85 100644 --- a/elpa/dired-narrow-20181114.1723/dired-narrow-autoloads.el +++ b/elpa/dired-narrow-20230512.1107/dired-narrow-autoloads.el @@ -1,4 +1,4 @@ -;;; dired-narrow-autoloads.el --- automatically extracted autoloads +;;; dired-narrow-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- ;; ;;; Code: @@ -10,9 +10,7 @@ ;;; Generated autoloads from dired-narrow.el (autoload 'dired-narrow-regexp "dired-narrow" "\ -Narrow a dired buffer to the files matching a regular expression. - -\(fn)" t nil) +Narrow a dired buffer to the files matching a regular expression." t nil) (autoload 'dired-narrow "dired-narrow" "\ Narrow a dired buffer to the files matching a string. @@ -21,20 +19,20 @@ 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\". - -\(fn)" t nil) +For example \"foo bar\" matches filename \"bar-and-foo.el\"." t nil) (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. +expression against the file name." t nil) -\(fn)" t nil) +(register-definition-prefixes "dired-narrow" '("dired-narrow-")) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "dired-narrow" '("dired-narrow-"))) +;;;*** + +;;;### (autoloads nil nil ("dired-narrow-pkg.el") (0 0 0 0)) ;;;*** diff --git a/elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el b/elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el new file mode 100644 index 00000000..7a3f4177 --- /dev/null +++ b/elpa/dired-narrow-20230512.1107/dired-narrow-pkg.el @@ -0,0 +1,14 @@ +(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-20181114.1723/dired-narrow.el b/elpa/dired-narrow-20230512.1107/dired-narrow.el similarity index 94% rename from elpa/dired-narrow-20181114.1723/dired-narrow.el rename to elpa/dired-narrow-20230512.1107/dired-narrow.el index e4d2d8a1..e041ab57 100644 --- a/elpa/dired-narrow-20181114.1723/dired-narrow.el +++ b/elpa/dired-narrow-20230512.1107/dired-narrow.el @@ -5,9 +5,8 @@ ;; Author: Matúš Goljer ;; Maintainer: Matúš Goljer ;; Version: 0.0.1 -;; Package-Version: 20181114.1723 ;; 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")) ;; Keywords: files ;; This program is free software; you can redistribute it and/or @@ -107,15 +106,14 @@ exit minibuffer and call `dired-narrow-exit-action'." :group 'dired-narrow) (defcustom dired-narrow-enable-blinking t - "If set to true highlight the chosen file shortly. -This feature works only when `dired-narrow-exit-when-one-left' is true." + "If non-nil, highlight the chosen file shortly. +Only works when `dired-narrow-exit-when-one-left' is non-nil." :type 'boolean :group 'dired-narrow) (defcustom dired-narrow-blink-time 0.2 - "How long should be highlighted a chosen file. -Units are seconds." - :type 'float + "How many seconds should a chosen file be highlighted." + :type 'number :group 'dired-narrow) (defface dired-narrow-blink @@ -242,7 +240,14 @@ read from minibuffer." (progn (dired-narrow-mode 1) (add-to-invisibility-spec :dired-narrow) - (setq disable-narrow (read-from-minibuffer "Filter: " nil dired-narrow-map)) + (setq disable-narrow (read-from-minibuffer + (pcase dired-narrow-filter-function + ('dired-narrow--regexp-filter + "Regex Filter:\s") + ('dired-narrow--fuzzy-filter + "Fuzzy Filter:\s") + (t "Filter:\s")) + nil dired-narrow-map)) (let ((inhibit-read-only t)) (dired-narrow--remove-text-with-property :dired-narrow)) ;; If the file no longer exists, we can't do anything, so diff --git a/elpa/direx-20170422.1327/direx-pkg.el b/elpa/direx-20170422.1327/direx-pkg.el deleted file mode 100644 index 5c845145..00000000 --- a/elpa/direx-20170422.1327/direx-pkg.el +++ /dev/null @@ -1,9 +0,0 @@ -(define-package "direx" "20170422.1327" "Simple Directory Explorer" 'nil :keywords - '("convenience") - :authors - '(("Tomohiro Matsuyama" . "m2ym.pub@gmail.com")) - :maintainer - '("Tomohiro Matsuyama" . "m2ym.pub@gmail.com")) -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/direx-20170422.1327/direx-autoloads.el b/elpa/direx-20230409.1425/direx-autoloads.el similarity index 55% rename from elpa/direx-20170422.1327/direx-autoloads.el rename to elpa/direx-20230409.1425/direx-autoloads.el index 6a634271..0d0e3082 100644 --- a/elpa/direx-20170422.1327/direx-autoloads.el +++ b/elpa/direx-20230409.1425/direx-autoloads.el @@ -1,4 +1,4 @@ -;;; direx-autoloads.el --- automatically extracted autoloads +;;; direx-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- ;; ;;; Code: @@ -9,34 +9,22 @@ ;;;### (autoloads nil "direx" "direx.el" (0 0 0 0)) ;;; Generated autoloads from direx.el -(autoload 'direx:jump-to-directory "direx" "\ +(autoload 'direx:jump-to-directory "direx" nil t nil) +(autoload 'direx:jump-to-directory-other-window "direx" nil t nil) -\(fn)" t nil) - -(autoload 'direx:jump-to-directory-other-window "direx" "\ - - -\(fn)" t nil) - -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "direx" '("direx:"))) +(register-definition-prefixes "direx" '("direx:")) ;;;*** ;;;### (autoloads nil "direx-project" "direx-project.el" (0 0 0 0)) ;;; Generated autoloads from direx-project.el -(autoload 'direx-project:jump-to-project-root "direx-project" "\ - - -\(fn)" t nil) - -(autoload 'direx-project:jump-to-project-root-other-window "direx-project" "\ - +(autoload 'direx-project:jump-to-project-root "direx-project" nil t nil) -\(fn)" t nil) +(autoload 'direx-project:jump-to-project-root-other-window "direx-project" nil t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "direx-project" '("direx-project:"))) +(register-definition-prefixes "direx-project" '("direx-project:")) ;;;*** diff --git a/elpa/direx-20230409.1425/direx-pkg.el b/elpa/direx-20230409.1425/direx-pkg.el new file mode 100644 index 00000000..cfc98081 --- /dev/null +++ b/elpa/direx-20230409.1425/direx-pkg.el @@ -0,0 +1,11 @@ +(define-package "direx" "20230409.1425" "Simple Directory Explorer" 'nil :commit "935d2010234c02c93e22d6e1cc72d595341ba855" :authors + '(("Tomohiro Matsuyama" . "m2ym.pub@gmail.com")) + :maintainers + '(("Tomohiro Matsuyama" . "m2ym.pub@gmail.com")) + :maintainer + '("Tomohiro Matsuyama" . "m2ym.pub@gmail.com") + :keywords + '("convenience")) +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/direx-20170422.1327/direx-project.el b/elpa/direx-20230409.1425/direx-project.el similarity index 97% rename from elpa/direx-20170422.1327/direx-project.el rename to elpa/direx-20230409.1425/direx-project.el index 6c156866..8ba5ffca 100644 --- a/elpa/direx-20170422.1327/direx-project.el +++ b/elpa/direx-20230409.1425/direx-project.el @@ -1,4 +1,4 @@ -;;; direx-project.el --- Project Module for Direx +;;; direx-project.el --- Project Module for Direx -*- lexical-binding:t -*- ;; Copyright (C) 2012-2015 Tomohiro Matsuyama diff --git a/elpa/direx-20170422.1327/direx.el b/elpa/direx-20230409.1425/direx.el similarity index 94% rename from elpa/direx-20170422.1327/direx.el rename to elpa/direx-20230409.1425/direx.el index ce34f17a..9cffc736 100644 --- a/elpa/direx-20170422.1327/direx.el +++ b/elpa/direx-20230409.1425/direx.el @@ -1,4 +1,4 @@ -;;; direx.el --- Simple Directory Explorer +;;; direx.el --- Simple Directory Explorer -*- lexical-binding:t -*- ;; Copyright (C) 2011-2015 Tomohiro Matsuyama @@ -26,7 +26,6 @@ ;;; Code: (require 'cl-lib) -(eval-when-compile (require 'cl)) (require 'eieio) (require 'dired) (require 'regexp-opt) @@ -71,14 +70,6 @@ (declare (indent 1)) `(let ((it ,test)) (when it ,@body))) -(defun direx:apply-partially (fun &rest args) - (if (fboundp 'apply-partially) - (apply 'apply-partially fun args) - (require 'cl) - (lexical-let ((fun fun) (args args)) - (lambda (&rest restargs) - (apply fun (append args restargs)))))) - (defun direx:starts-with (x y) (and (<= (length y) (length x)) (equal (substring x 0 (length y)) y))) @@ -129,35 +120,35 @@ ((name :initarg :name :accessor direx:tree-name))) -(defgeneric direx:tree-equals (x y) +(cl-defgeneric direx:tree-equals (x y) "Returns t if X is equal to Y.") -(defmethod direx:tree-equals (x y) +(cl-defmethod direx:tree-equals (x y) (eq x y)) -(defgeneric direx:tree-status (tree) +(cl-defgeneric direx:tree-status (tree) "Returns a status of TREE in string.") -(defmethod direx:tree-status (tree) +(cl-defmethod direx:tree-status (tree) "") (defclass direx:node (direx:tree) ()) -(defgeneric direx:node-children (node) +(cl-defgeneric direx:node-children (node) "Returns the children of the NODE.") -(defmethod direx:node-children (node) +(cl-defmethod direx:node-children (node) nil) -(defgeneric direx:node-contains (node descendant) +(cl-defgeneric direx:node-contains (node descendant) "Returns t if the NODE has the DESCENDANT. The default implementation of this generic function uses `direx:node-children' to expand the descendants of the NODE recursively and check if the DESCENDANT is a member of the descendants. You may add a heuristic method for speed.") -(defmethod direx:node-contains (node descendant) +(cl-defmethod direx:node-contains (node descendant) (cl-loop for child in (direx:node-children node) thereis (or (direx:tree-equals child descendant) (and (cl-typep child 'direx:node) @@ -183,16 +174,16 @@ descendants. You may add a heuristic method for speed.") (overlay :accessor direx:item-overlay) (open :accessor direx:item-open))) -(defgeneric direx:generic-find-item (item not-this-window)) +(cl-defgeneric direx:generic-find-item (item not-this-window)) -(defgeneric direx:generic-view-item (item not-this-window)) +(cl-defgeneric direx:generic-view-item (item not-this-window)) -(defgeneric direx:generic-display-item (item)) +(cl-defgeneric direx:generic-display-item (item)) -(defgeneric direx:make-item (tree parent) +(cl-defgeneric direx:make-item (tree parent) "Returns a item of the TREE.") -(defmethod direx:make-item (tree parent) +(cl-defmethod direx:make-item (tree parent) (make-instance 'direx:item :tree tree :parent parent)) (defun direx:make-item-children (item) @@ -368,13 +359,13 @@ mouse-2: find this node in other window")) (direx:item-collapse item) (direx:item-expand item))) -(defmethod direx:item-refresh ((item direx:item)) +(cl-defmethod direx:item-refresh ((item direx:item)) (when (and (not (direx:item-leaf-p item)) (direx:item-children item)) (cl-loop with point = (overlay-end (direx:item-overlay item)) with old-children = (direx:item-children item) for new-child in (direx:make-item-children item) - for old-child = (cl-find-if (direx:apply-partially + for old-child = (cl-find-if (apply-partially 'direx:item-equals new-child) old-children) if old-child @@ -410,12 +401,12 @@ mouse-2: find this node in other window")) ((full-name :initarg :full-name :accessor direx:file-full-name))) -(defmethod direx:tree-equals ((x direx:file) y) +(cl-defmethod direx:tree-equals ((x direx:file) y) (or (eq x y) (and (cl-typep y 'direx:file) (equal (direx:file-full-name x) (direx:file-full-name y))))) -(defmethod direx:tree-status ((file direx:file)) +(cl-defmethod direx:tree-status ((file direx:file)) (let* ((filename (direx:file-full-name file)) (dired-actual-switches "-la") (file-list (list (if (direx:regular-file-item-p file) @@ -448,7 +439,7 @@ mouse-2: find this node in other window")) :name name :full-name dirname))) -(defmethod direx:node-children ((dir direx:directory)) +(cl-defmethod direx:node-children ((dir direx:directory)) (cl-loop with dirname = (direx:file-full-name dir) for filename in (directory-files dirname t) for basename = (file-name-nondirectory filename) @@ -458,7 +449,7 @@ mouse-2: find this node in other window")) else collect (direx:make-regular-file filename))) -(defmethod direx:node-contains ((dir direx:directory) file) +(cl-defmethod direx:node-contains ((dir direx:directory) file) (and (cl-typep file 'direx:file) (direx:starts-with (direx:file-full-name file) (direx:file-full-name dir)))) @@ -509,7 +500,7 @@ mouse-2: find this node in other window")) (defun direx:do-delete-files () (interactive) (let* ((item (direx:item-at-point!)) - (file (direx:item-tree item)) + (file (direx:item-tree item))h (file-full-name (direx:file-full-name file))) (when (yes-or-no-p (format "Delete %s" (direx:tree-name file))) (dired-delete-file file-full-name dired-recursive-deletes t) @@ -624,23 +615,23 @@ mouse-2: find this node in other window")) (defclass direx:regular-file-item (direx:file-item) ()) -(defmethod direx:generic-find-item ((item direx:regular-file-item) not-this-window) +(cl-defmethod direx:generic-find-item ((item direx:regular-file-item) not-this-window) (let ((filename (direx:file-full-name (direx:item-tree item)))) (if not-this-window (find-file-other-window filename) (find-file filename)))) -(defmethod direx:generic-view-item ((item direx:regular-file-item) not-this-window) +(cl-defmethod direx:generic-view-item ((item direx:regular-file-item) not-this-window) (let ((filename (direx:file-full-name (direx:item-tree item)))) (if not-this-window (view-file-other-window filename) (view-file filename)))) -(defmethod direx:generic-display-item ((item direx:regular-file-item)) +(cl-defmethod direx:generic-display-item ((item direx:regular-file-item)) (let ((filename (direx:file-full-name (direx:item-tree item)))) (display-buffer (find-file-noselect filename)))) -(defmethod direx:make-item ((file direx:regular-file) parent) +(cl-defmethod direx:make-item ((file direx:regular-file) parent) (let* ((filename (direx:file-full-name file)) (face (when (string-match direx:ignored-files-regexp filename) 'dired-ignored))) @@ -653,17 +644,17 @@ mouse-2: find this node in other window")) (defclass direx:directory-item (direx:file-item) ()) -(defmethod direx:generic-find-item ((item direx:directory-item) not-this-window) +(cl-defmethod direx:generic-find-item ((item direx:directory-item) not-this-window) (let ((dirname (direx:file-full-name (direx:item-tree item)))) (if not-this-window (dired-other-window dirname) (dired dirname)))) -(defmethod direx:generic-display-item ((item direx:directory-item)) +(cl-defmethod direx:generic-display-item ((item direx:directory-item)) (let ((dirname (direx:file-full-name (direx:item-tree item)))) (display-buffer (dired-noselect dirname)))) -(defmethod direx:make-item ((dir direx:directory) parent) +(cl-defmethod direx:make-item ((dir direx:directory) parent) (make-instance 'direx:directory-item :tree dir :parent parent @@ -690,7 +681,7 @@ mouse-2: find this node in other window")) (defun direx:find-root-item-if (predicate) (cl-find-if predicate - (mapcar (direx:apply-partially 'buffer-local-value 'direx:root-item) + (mapcar (apply-partially 'buffer-local-value 'direx:root-item) (direx:buffer-list)))) (defun direx:find-root-item-for-root (root) @@ -704,9 +695,9 @@ mouse-2: find this node in other window")) (defun direx:buffer-list () (cl-remove-if-not 'direx:buffer-live-p (buffer-list))) -(defgeneric direx:make-buffer (root)) +(cl-defgeneric direx:make-buffer (root)) -(defmethod direx:make-buffer ((root direx:tree)) +(cl-defmethod direx:make-buffer ((root direx:tree)) (let ((buffer (generate-new-buffer (direx:tree-name root)))) (with-current-buffer buffer (direx:direx-mode) @@ -714,8 +705,8 @@ mouse-2: find this node in other window")) (setq-local revert-buffer-function 'direx:revert-buffer)) buffer)) -(defmethod direx:make-buffer ((dir direx:directory)) - (with-current-buffer (call-next-method) +(cl-defmethod direx:make-buffer ((dir direx:directory)) + (with-current-buffer (cl-call-next-method) (set (make-local-variable 'dired-directory) (direx:file-full-name dir)) (current-buffer))) -- 2.47.3