Skip to content
This repository has been archived by the owner on Jun 17, 2023. It is now read-only.

DOC: Better key discoverability in ztree-diff mode. #82

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DOC: Better key discoverability in ztree-diff mode. #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ztree-diff.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
;;
;; Created: 2013-11-11
;;
;; Modifications: 2022 Quazgar <[email protected]>
;;
;; Keywords: files tools
;; URL: https://github.com/fourier/ztree
;; Compatibility: GNU Emacs 24.x
Expand Down Expand Up @@ -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)
Expand Down