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

Commit

Permalink
DOC: Better key discoverability in ztree-diff mode.
Browse files Browse the repository at this point in the history
Most hotkeys are now in the header, besides the legend.  Total width is 86 now.
  • Loading branch information
quazgar authored and Daniel Hornung committed Jan 12, 2022
1 parent f05677f commit fa49ba5
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions ztree-diff.el
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
;;
;; Created: 2013-11-11
;;
;; Modifications: 2022 Quazgar <quazgar@posteo.de>
;;
;; 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

0 comments on commit fa49ba5

Please sign in to comment.