[elpa] externals/ztree f05677f: Minor changes in ztree

[Stefan Monnier]

branch: externals/ztree
commit f05677f9696e573c8c607e8876fb4a0cccbc491f
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Alexey Veretennikov <fourier@protonmail.ch>

    Minor changes in ztree
    
    Hi,
    
    Could you install the patch below to ztree?
    
            Stefan
    
    2021-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
    
        * ztree-diff-model.el (ztree-diff-additional-options):
        * ztree-dir.el (ztree-dir-move-focus): Avoid overlong lines.
        (ztreedir-mode):
        * ztree-diff.el (ztreediff-mode): Avoid pre-Emacs-21 calling convention
        of define-minor-mode.
    
        * .gitignore: Ignore generated files.
---
 .gitignore          |  3 +++
 ztree-diff-model.el |  3 ++-
 ztree-diff.el       | 26 +++++++++++---------------
 ztree-dir.el        | 19 ++++++++-----------
 ztree-view.el       | 24 ++++++++++++++----------
 5 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2981093
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/ztree-autoloads.el
+/ztree-pkg.el
+*.elc
diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index aaf2a8f..e2510d0 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -40,7 +40,8 @@
   "Mark files as different if their size different")
 
 (defvar ztree-diff-additional-options nil
-  "Command-line options for the diff program used as a diff backend. These 
options are added to default '-q' option.
+  "Command-line options for the diff program used as a diff backend.
+These options are added to default '-q' option.
 Should be a list of strings.
 Example:
 (setq ztree-diff-options '(\"-w\" \"-i\"))")
diff --git a/ztree-diff.el b/ztree-diff.el
index 41d69a1..3c3be38 100644
--- a/ztree-diff.el
+++ b/ztree-diff.el
@@ -107,21 +107,17 @@ to restore last configuration even if there were a couple 
of ediff sessions")
 ;;;###autoload
 (define-minor-mode ztreediff-mode
   "A minor mode for displaying the difference of the directory trees in text 
mode."
-  ;; initial value
-  nil
-  ;; modeline name
-  " Diff"
-  ;; The minor mode keymap
-  `(
-    (,(kbd "C") . ztree-diff-copy)
-    (,(kbd "h") . ztree-diff-toggle-show-equal-files)
-    (,(kbd "H") . ztree-diff-toggle-show-filtered-files)
-    (,(kbd "D") . ztree-diff-delete-file)
-    (,(kbd "v") . ztree-diff-view-file)
-    (,(kbd "d") . ztree-diff-simple-diff-files)
-    (,(kbd "r") . ztree-diff-partial-rescan)
-    (,(kbd "R") . ztree-diff-full-rescan)
-    ([f5] . ztree-diff-full-rescan)))
+  :lighter " Diff"
+  :keymap `(
+            (,(kbd "C") . ztree-diff-copy)
+            (,(kbd "h") . ztree-diff-toggle-show-equal-files)
+            (,(kbd "H") . ztree-diff-toggle-show-filtered-files)
+            (,(kbd "D") . ztree-diff-delete-file)
+            (,(kbd "v") . ztree-diff-view-file)
+            (,(kbd "d") . ztree-diff-simple-diff-files)
+            (,(kbd "r") . ztree-diff-partial-rescan)
+            (,(kbd "R") . ztree-diff-full-rescan)
+            ([f5] . ztree-diff-full-rescan)))
 
 
 (defun ztree-diff-node-face (node)
diff --git a/ztree-dir.el b/ztree-dir.el
index b0d7880..a42fd1b 100644
--- a/ztree-dir.el
+++ b/ztree-dir.el
@@ -61,7 +61,8 @@ By default all filest starting with dot `.', including . and 
..")
 ;;
 
 (defvar ztree-dir-move-focus nil
-  "Defines if move focus to opened window on hard-action command (RETURN) on a 
file.")
+  "If non-nil move focus to opened window on hard-action command.
+E.g. when pressing RET on a file.")
 
 (defvar-local ztree-dir-filter-list (list ztree-hidden-files-regexp)
   "List of regexp file names to filter out.
@@ -90,16 +91,12 @@ One could add own filters in the following way:
 
 (define-minor-mode ztreedir-mode
   "A minor mode for displaying the directory trees in text mode."
-  ;; initial value
-  nil
-  ;; modeline name
-  " Dir"
-  ;; The minor mode keymap
-  `(
-    (,(kbd "H") . ztree-dir-toggle-show-filtered-files)
-    (,(kbd ">") . ztree-dir-narrow-to-dir)
-    (,(kbd "<") . ztree-dir-widen-to-parent)
-    (,(kbd "d") . ztree-dir-open-dired-at-point)))
+  :lighter " Dir"
+  :keymap `(
+            (,(kbd "H") . ztree-dir-toggle-show-filtered-files)
+            (,(kbd ">") . ztree-dir-narrow-to-dir)
+            (,(kbd "<") . ztree-dir-widen-to-parent)
+            (,(kbd "d") . ztree-dir-open-dired-at-point)))
 
 
 
diff --git a/ztree-view.el b/ztree-view.el
index 43f86df..ccad5b4 100644
--- a/ztree-view.el
+++ b/ztree-view.el
@@ -105,17 +105,21 @@ MUST inster newline at the end!")
 
 (defvar ztree-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "\r") 'ztree-perform-action)
-    (define-key map (kbd "SPC") 'ztree-perform-soft-action)
-    (define-key map [double-mouse-1] 'ztree-perform-action)
-    (define-key map (kbd "TAB") 'ztree-jump-side)
-    (define-key map (kbd "g") 'ztree-refresh-buffer)
-    (define-key map (kbd "x") 'ztree-toggle-expand-subtree)
-    (define-key map [remap next-line] 'ztree-next-line)
-    (define-key map [remap previous-line] 'ztree-previous-line)
+    (define-key map (kbd "\r") #'ztree-perform-action)
+    (define-key map (kbd "SPC") #'ztree-perform-soft-action)
+    (define-key map [double-mouse-1] #'ztree-perform-action)
+    (define-key map (kbd "TAB") #'ztree-jump-side)
+    (define-key map (kbd "g") #'ztree-refresh-buffer)
+    (define-key map (kbd "x") #'ztree-toggle-expand-subtree)
+    (define-key map [remap next-line] #'ztree-next-line)
+    (define-key map [remap previous-line] #'ztree-previous-line)
+    ;; FIXME: Testing `window-system' is problematic since we can have
+    ;; both tty and GUI frames at the same time.
     (if window-system
-        (define-key map (kbd "<backspace>") 'ztree-move-up-in-tree)
-      (define-key map "\177" 'ztree-move-up-in-tree))
+        ;; FIXME: Why?  `backspace' is supposed to be remapped to DEL
+        ;; (aka \177) by `function-key-map' so this should not be needed.
+        (define-key map (kbd "<backspace>") #'ztree-move-up-in-tree)
+      (define-key map "\177" #'ztree-move-up-in-tree))
     map)
   "Keymap for `ztree-mode'.")