From bebc0d7082e1fd17856d4a44e39ce7355d0f48a7 Mon Sep 17 00:00:00 2001 From: Quazgar Date: Wed, 12 Jan 2022 16:25:24 +0100 Subject: [PATCH] DOC: Better key discoverability in ztree-diff mode. Most hotkeys are now in the header, besides the legend. Total width is 86 now. --- ztree-diff.el | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ztree-diff.el b/ztree-diff.el index 3c3be38..82ae264 100644 --- a/ztree-diff.el +++ b/ztree-diff.el @@ -6,6 +6,8 @@ ;; ;; Created: 2013-11-11 ;; +;; Modifications: 2022 Quazgar +;; ;; Keywords: files tools ;; URL: https://github.com/fourier/ztree ;; Compatibility: GNU Emacs 24.x @@ -142,16 +144,20 @@ to restore last configuration even if there were a couple of ediff sessions") (ztree-insert-with-face "Legend:" ztreep-diff-header-small-face) (insert "\n") (ztree-insert-with-face " Normal file " ztreep-diff-model-normal-face) - (ztree-insert-with-face "- same on both sides" ztreep-diff-header-small-face) + (ztree-insert-with-face "- same on both sides " ztreep-diff-header-small-face) + (ztree-insert-with-face " | TAB: switch | h: show/hide identical" ztreep-diff-header-small-face) (insert "\n") (ztree-insert-with-face " Orphan file " ztreep-diff-model-add-face) (ztree-insert-with-face "- does not exist on other side" ztreep-diff-header-small-face) + (ztree-insert-with-face " | SPC: diff | H: show/hide hidden" ztreep-diff-header-small-face) (insert "\n") (ztree-insert-with-face " Mismatch file " ztreep-diff-model-diff-face) - (ztree-insert-with-face "- different from other side" ztreep-diff-header-small-face) + (ztree-insert-with-face "- different from other side " ztreep-diff-header-small-face) + (ztree-insert-with-face " | RET: ediff | C: copy to other" ztreep-diff-header-small-face) (insert "\n ") (ztree-insert-with-face "Ignored file" ztreep-diff-model-ignored-face) - (ztree-insert-with-face " - ignored from comparison" ztreep-diff-header-small-face) + (ztree-insert-with-face " - ignored from comparison " ztreep-diff-header-small-face) + (ztree-insert-with-face " | F5: rescan | D: delete | v: quick view" ztreep-diff-header-small-face) (insert "\n") (ztree-insert-with-face "==============" ztreep-diff-header-face)