scip/dot-emacs
1
0
Fork 0
mirror of https://codeberg.org/scip/dot-emacs.git synced 2025-12-17 12:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

+ merge + dir

Browse Source
This commit is contained in:
Thomas von Dein
2020-09-23 13:07:30 +02:00
parent c97a264512
commit 76b02ccf44
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.emacs
View File

@@ -5500,11 +5500,13 @@ defun."
" "
RCS revision control. Current buffer %(file-name-nondirectory (buffer-file-name)) is under RCS: %(rcs-is-under-revision). RCS revision control. Current buffer %(file-name-nondirectory (buffer-file-name)) is under RCS: %(rcs-is-under-revision).
_co_: Checkout _co_: Checkout (C-x v v)
_ci_: Checkin _ci_: Checkin (C-x v v)
_d_: Diff _d_: Diff (C-x v =)
_u_: Undo Changes _u_: Undo Changes (C-x v u)
_l_: View revision log _l_: View revision log (C-x v l)
_s_: Status (C-x v d)
_m_: Merge (C-x v m)
_q_: Cancel _q_: Cancel
^^^^^^^^--------------------- ^^^^^^^^---------------------
@@ -5517,7 +5519,9 @@ Reach this hydra with <C-x R>
("d" vc-version-diff) ("d" vc-version-diff)
("u" vc-revert-buffer) ("u" vc-revert-buffer)
("l" vc-print-log) ("l" vc-print-log)
("q" nil nil :color red)) ("s" vc-dir)
("m" vc-merge)
("q" nil nil :color red))
(global-set-key (kbd "C-x R") 'hydra-rcs/body) (global-set-key (kbd "C-x R") 'hydra-rcs/body)