From cab1e69585f7ad47613e45d7123ebfe64bba0a7e Mon Sep 17 00:00:00 2001 From: Spenser Truex Date: Wed, 13 Nov 2019 23:26:18 -0800 Subject: [PATCH] rectangles: R; kmacros: km; timeclock: tt; ediff: E; insert-buf: ib --- CHANGELOG.develop | 90 ++++++++++++++ .../spacemacs-defaults/keybindings.el | 110 +++++++++++++++++- 2 files changed, 198 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 9cd7974e1..7b322cef7 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -679,6 +679,96 @@ Other: (thanks to Codruț Constantin Gușoi) - New key binding ~SPC b H~ to open or select the =*Help*= buffer (thanks to duianto) + - New ~SPC E~ prefix for ediff commands: + - ~SPC E b 3~ ediff-buffers3 + - ~SPC E b b~ ediff-buffers + - ~SPC E p b~ ediff-patch-buffer + - ~SPC E B~ ediff-backup + - ~SPC E d 3~ ediff-directories3 + - ~SPC E d d~ ediff-directories + - ~SPC E d r~ ediff-directory-revisions + - ~SPC E f .~ spacemacs/ediff-dotfile-and-template + - ~SPC E f 3~ ediff-files3 + - ~SPC E f f~ ediff-files + - ~SPC E f p~ ediff-patch-file + - ~SPC E h~ ediff-documentation + - ~SPC E m b 3~ ediff-merge-buffers-with-ancestor + - ~SPC E m b b~ ediff-merge-buffers + - ~SPC E m d 3~ ediff-merge-directories-with-ancestor + - ~SPC E m d d~ ediff-merge-directories + - ~SPC E m f 3~ ediff-merge-files-with-ancestor + - ~SPC E m f f~ ediff-merge-files + - ~SPC E m r 3~ ediff-merge-revisions-with-ancestor + - ~SPC E m r r~ ediff-merge-revisions + - ~SPC E r l~ ediff-regions-linewise + - ~SPC E r w~ ediff-regions-wordwise + - ~SPC E s~ ediff-show-registry + - ~SPC E v~ ediff-revision + - ~SPC E w l~ ediff-windows-linewise + - ~SPC E w w~ ediff-windows-wordwise + (thanks to Spenser Truex) + - New ~SPC K~ prefix and subprefixes to use keyboard macros built-ins: + - ~SPC K (~ kmacro-start-macro-or-insert-counter + - ~SPC K )~ kmacro-end-or-call-macro-repeat + - ~SPC K 2 c~ kmacro-call-ring-2nd + - ~SPC K 2 C~ kmacro-call-ring-2nd-repeat + - ~SPC K 2 v~ kmacro-view-ring-2nd + - ~SPC K a~ kmacro-add-counter + - ~SPC K b~ kmacro-bind-to-key + - ~SPC K c~ kmacro-call-macro + - ~SPC K d~ kmacro-delete-ring-head + - ~SPC K e l~ kmacro-edit-lossage + - ~SPC K e m~ kmacro-edit-macro + - ~SPC K e r~ kmacro-edit-macro-repeat + - ~SPC K e t~ kmacro-step-edit-macro + - ~SPC K i~ kmacro-insert-counter + - ~SPC K m~ kmacro-end-call-mouse + - ~SPC K n~ kmacro-cycle-ring-next + - ~SPC K N~ kmacro-name-last-macro + - ~SPC K p~ kmacro-cycle-ring-previous + - ~SPC K r~ helm-register + - ~SPC K s c~ kmacro-set-counter + - ~SPC K s f~ kmacro-set-format + - ~SPC K s r~ kmacro-swap-ring + - ~SPC K v~ kmacro-view-macro + - ~SPC K V~ kmacro-view-macro-repeat + - ~SPC K w~ kmacro-to-register + - ~SPC K y~ jump-to-register + (thanks to Spenser Truex) + - New ~SPC R~ prefix to use rectangle manipulation built-ins: + - ~SPC R !~ clear-rectangle + - ~SPC R c~ close-rectangle + - ~SPC R d~ delete-rectangle + - ~SPC R e~ rectangle-exchange-point-and-mark + - ~SPC R i~ copy-rectangle-to-register + - ~SPC R k~ kill-rectangle + - ~SPC R l~ rectangle-left-char + - ~SPC R m~ rectangle-mark-mode + - ~SPC R n~ rectangle-next-line + - ~SPC R N~ rectangle-number-lines + - ~SPC R o~ open-rectangle + - ~SPC R p~ rectangle-previous-line + - ~SPC R r~ rectangle-right-char + - ~SPC R s~ string-rectangle + - ~SPC R t~ transpose-regions + - ~SPC R y~ yank-rectangle + (thanks to Spenser Truex) + - New ~SPC t t~ prefix for timeclock clock-in clock-out management: + - ~SPC t t c~ timeclock-change + - ~SPC t t e~ timeclock-workday-elapsed-string + - ~SPC t t g~ timeclock-workday-remaining-string + - ~SPC t t i~ timeclock-in + - ~SPC t t l~ timeclock-when-to-leave-string + - ~SPC t t m~ timeclock-modeline-display + - ~SPC t t o~ timeclock-out + - ~SPC t t r~ timeclock-reread-log + - ~SPC t t s~ timeclock-status-string + - ~SPC t t u~ timeclock-update-mode-line + - ~SPC t t v~ timeclock-visit-timelog + - ~SPC t t w~ timeclock-when-to-leave-string + (thanks to Spenser Truex) + - New ~SPC i b~ keybinding to insert another buffer's contents into the + current one. (thanks to Spenser Truex) - New ~SPC b N~ prefix to create an empty buffer: - ~SPC b N h~ create new empty buffer in a new window on the left - ~SPC b N j~ create new empty buffer in a new window at the bottom diff --git a/layers/+spacemacs/spacemacs-defaults/keybindings.el b/layers/+spacemacs/spacemacs-defaults/keybindings.el index 1df3437de..9eb35dd67 100644 --- a/layers/+spacemacs/spacemacs-defaults/keybindings.el +++ b/layers/+spacemacs/spacemacs-defaults/keybindings.el @@ -1,6 +1,6 @@ ;;; keybindings.el --- Spacemacs Defaults Layer key-bindings File ;; -;; Copyright (c) 2012-2018 Sylvain Benner & Contributors +;; Copyright (c) 2012-2019 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -29,6 +29,17 @@ ("C" "capture/colors") ("d" "documentation") ("e" "errors") + ("E" "ediff") + ("Eb" "buffers") + ("Ed" "directories") + ("Ef" "files") + ("Em" "merge") + ("Emb" "buffers") + ("Emd" "directories") + ("Emf" "files") + ("Emr" "revisions") + ("Er" "regions") + ("Ew" "windows") ("f" "files") ("fC" "files/convert") ("fe" "emacs(spacemacs)") @@ -49,6 +60,10 @@ ("k" "lisp") ("kd" "delete") ("kD" "delete-backward") + ("K" "kmacros") + ("K2" "ring") + ("Ke" "edit") + ("Ks" "set/swap") ("k`" "hybrid") ("m" "major mode commands") ("n" "narrow/numbers") @@ -57,6 +72,7 @@ ("p" "projects") ("q" "quit") ("r" "registers/rings/resume") + ("R" "rectangles") ("s" "search/symbol") ("sa" "ag") ("sg" "grep") @@ -73,6 +89,7 @@ ("tEh" "hybrid (hybrid-mode)") ("th" "highlight") ("tm" "modeline") + ("tt" "timeclock") ("T" "UI toggles/themes") ("C-t" "other toggles") ("u" "universal arg") @@ -134,6 +151,52 @@ 'universal-argument-more)) ;; shell command ------------------------------------------------------------- (spacemacs/set-leader-keys "!" 'shell-command) +;; kmacros -------------------------------------------------------------------- +(spacemacs/set-leader-keys + "K(" 'kmacro-start-macro-or-insert-counter + "K)" 'kmacro-end-or-call-macro-repeat + "K2c" 'kmacro-call-ring-2nd + "K2C" 'kmacro-call-ring-2nd-repeat + "K2v" 'kmacro-view-ring-2nd + "Ka" 'kmacro-add-counter + "Kb" 'kmacro-bind-to-key + "Kc" 'kmacro-call-macro + "Kd" 'kmacro-delete-ring-head + "Kel" 'kmacro-edit-lossage + "Kem" 'kmacro-edit-macro + "Ker" 'kmacro-edit-macro-repeat + "Ket" 'kmacro-step-edit-macro + "Ki" 'kmacro-insert-counter + "Km" 'kmacro-end-call-mouse + "Kn" 'kmacro-cycle-ring-next + "KN" 'kmacro-name-last-macro + "Kp" 'kmacro-cycle-ring-previous + "Kr" 'helm-register + "Ksc" 'kmacro-set-counter + "Ksf" 'kmacro-set-format + "Ksr" 'kmacro-swap-ring + "Kv" 'kmacro-view-macro + "KV" 'kmacro-view-macro-repeat + "Kw" 'kmacro-to-register + "Ky" 'jump-to-register) +;; rectangles ------------------------------------------------------------------ +(spacemacs/set-leader-keys + "R!" 'clear-rectangle + "Rc" 'close-rectangle + "Rd" 'delete-rectangle + "Re" 'rectangle-exchange-point-and-mark + "Ri" 'copy-rectangle-to-register + "Rk" 'kill-rectangle + "Rl" 'rectangle-left-char + "Rm" 'rectangle-mark-mode + "Rn" 'rectangle-next-line + "RN" 'rectangle-number-lines + "Ro" 'open-rectangle + "Rp" 'rectangle-previous-line + "Rr" 'rectangle-right-char + "Rs" 'string-rectangle + "Rt" 'transpose-regions + "Ry" 'yank-rectangle) ;; applications --------------------------------------------------------------- (spacemacs/set-leader-keys "ac" 'calc-dispatch @@ -223,6 +286,34 @@ ("z" recenter-top-bottom "recenter") ("q" nil "quit" :exit t) :evil-leader "e.") +;; ediff ---------------------------------------------------------------------- +(spacemacs/set-leader-keys + "Eb3" 'ediff-buffers3 + "Ebb" 'ediff-buffers + "Ebp" 'ediff-patch-buffer + "EB" 'ediff-backup + "Ed3" 'ediff-directories3 + "Edd" 'ediff-directories + "Edr" 'ediff-directory-revisions + "Ef." 'spacemacs/ediff-dotfile-and-template + "Ef3" 'ediff-files3 + "Eff" 'ediff-files + "Efp" 'ediff-patch-file + "Eh" 'ediff-documentation + "Emb3" 'ediff-merge-buffers-with-ancestor + "Embb" 'ediff-merge-buffers + "Emd3" 'ediff-merge-directories-with-ancestor + "Emdd" 'ediff-merge-directories + "Emf3" 'ediff-merge-files-with-ancestor + "Emff" 'ediff-merge-files + "Emr3" 'ediff-merge-revisions-with-ancestor + "Emrr" 'ediff-merge-revisions + "Erl" 'ediff-regions-linewise + "Erw" 'ediff-regions-wordwise + "Es" 'ediff-show-registry + "Ev" 'ediff-revision + "Ewl" 'ediff-windows-linewise + "Eww" 'ediff-windows-wordwise) ;; file ----------------------------------------------------------------------- (spacemacs/set-leader-keys "fA" 'spacemacs/find-file-and-replace-buffer @@ -292,7 +383,8 @@ "iJ" 'spacemacs/insert-line-below-no-indent "iK" 'spacemacs/insert-line-above-no-indent "ik" 'spacemacs/evil-insert-line-above - "ij" 'spacemacs/evil-insert-line-below) + "ij" 'spacemacs/evil-insert-line-below + "ib" 'insert-buffer) ;; format --------------------------------------------------------------------- (spacemacs/set-leader-keys "j(" 'check-parens @@ -457,6 +549,20 @@ respond to this toggle." "qq" 'spacemacs/prompt-kill-emacs "qQ" 'spacemacs/kill-emacs "qf" 'spacemacs/frame-killer) +;; timeclock ------------------------------------------------------------------ +(spacemacs/set-leader-keys + "ttc" 'timeclock-change + "tte" 'timeclock-workday-elapsed-string + "ttg" 'timeclock-workday-remaining-string + "tti" 'timeclock-in + "ttl" 'timeclock-when-to-leave-string + "ttm" 'timeclock-modeline-display + "tto" 'timeclock-out + "ttr" 'timeclock-reread-log + "tts" 'timeclock-status-string + "ttu" 'timeclock-update-mode-line + "ttv" 'timeclock-visit-timelog + "ttw" 'timeclock-when-to-leave-string) ;; window --------------------------------------------------------------------- (defun split-window-below-and-focus () "Split the window vertically and focus the new window."