From 2cbc27f5c7514c1043f9ea52292178a884c6616d Mon Sep 17 00:00:00 2001 Message-Id: <2cbc27f5c7514c1043f9ea52292178a884c6616d.1716654197.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 6 Jul 2018 20:37:38 +0100 Subject: [PATCH] dot/emacs: Sort the global keybindings list. Organization: Straylight/Edgeware From: Mark Wooding Astonishingly there don't appear to be any conflicts. --- dot/emacs | 62 +++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dot/emacs b/dot/emacs index 4240f51..ac44ce2 100644 --- a/dot/emacs +++ b/dot/emacs @@ -630,58 +630,60 @@ (require 'smex) (smex-initialize) (global-set-key [?\M-x] 'smex)) (progn - (global-set-key [?\C-c ?\M-x] 'execute-extended-command) (global-set-key [?\e ?\e] 'mdw-wrong) (global-set-key [?\e ?\C-\] ?\C-\]] 'keyboard-escape-quit) - (global-set-key [?\C-c ?w left] 'windmove-left) - (global-set-key [?\C-c ?w ?h] 'windmove-left) - (global-set-key [?\C-c ?w up] 'windmove-up) - (global-set-key [?\C-c ?w ?k] 'windmove-up) - (global-set-key [?\C-c ?w down] 'windmove-down) - (global-set-key [?\C-c ?w ?j] 'windmove-down) - (global-set-key [?\C-c ?w right] 'windmove-right) - (global-set-key [?\C-c ?w ?l] 'windmove-right) - (global-set-key [?\C-c ?g ?l] 'org-store-link) + (global-set-key [?\C-c ?\M-x] 'execute-extended-command) + (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point) + (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point) (global-set-key [?\C-c ?g ?a] 'org-agenda) (global-set-key [?\C-c ?g ?b] 'org-iswitchb) - (global-set-key [?\C-c ?t ?i] 'timeclock-in) - (global-set-key [?\C-c ?t ?c] 'timeclock-change) - (global-set-key [?\C-c ?t ?o] 'timeclock-out) - (global-set-key [?\C-c ?t ?R] 'timeclock-reread-log) - (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string) - (global-set-key [?\C-c ?t ?s] 'timeclock-status-string) - (global-set-key [?\C-c ?m ?m] 'magit-status) + (global-set-key [?\C-c ?g ?l] 'org-store-link) + (global-set-key [?\C-c ?k] 'mdw-compile) + (global-set-key [?\C-c ?m ?4 ?f] 'magit-find-file-other-window) (global-set-key [?\C-c ?m ?b] 'magit-blame) (global-set-key [?\C-c ?m ?d] 'magit-dispatch-popup) (global-set-key [?\C-c ?m ?f] 'magit-find-file) - (global-set-key [?\C-c ?m ?4 ?f] 'magit-find-file-other-window) + (global-set-key [?\C-c ?m ?m] 'magit-status) (global-set-key [?\C-c ?m ?r] 'magit-list-repositories) (global-set-key [?\C-c ?m ?w] 'magit-wip-log) - (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause) (global-set-key [?\C-c ?p ?s] 'mdw-mpc-stop) (global-set-key [?\C-c ?p ?<] 'mdw-mpc-prev) (global-set-key [?\C-c ?p ?>] 'mdw-mpc-next) (global-set-key [?\C-c ?p ?+] 'mdw-mpc-louder) (global-set-key [?\C-c ?p ?-] 'mdw-mpc-quieter) (global-set-key [?\C-c ?p ??] 'mdw-mpc-now-playing) - (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here) - (global-set-key [?\C-c ?t ?.] 'gtags-find-tag) - (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag) + (global-set-key [?\C-c ?p ?p] 'mdw-mpc-play-or-pause) (global-set-key [?\C-c ?t ?4 ?.] 'gtags-find-tag-other-window) + (global-set-key [?\C-c ?t ?.] 'gtags-find-tag) + (global-set-key [?\C-c ?t ?R] 'timeclock-reread-log) (global-set-key [?\C-c ?t ?,] 'gtags-pop-stack) - (global-set-key [?\C-c ?k] 'mdw-compile) - (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) - (global-set-key [?\M-#] 'calc-dispatch) - (global-set-key [?\C-x ?/] 'auto-fill-mode) + (global-set-key [?\C-c ?t ?c] 'timeclock-change) + (global-set-key [?\C-c ?t ?i] 'timeclock-in) + (global-set-key [?\C-c ?t ?o] 'timeclock-out) + (global-set-key [?\C-c ?t ?r] 'gtags-find-rtag) + (global-set-key [?\C-c ?t ?s] 'timeclock-status-string) + (global-set-key [?\C-c ?t ?t] 'gtags-find-tag-from-here) + (global-set-key [?\C-c ?t ?w] 'timeclock-workday-remaining-string) (global-set-key [?\C-c ?w ?d] 'mdw-divvy-window) + (global-set-key [?\C-c ?w ?h] 'windmove-left) + (global-set-key [?\C-c ?w ?j] 'windmove-down) + (global-set-key [?\C-c ?w ?k] 'windmove-up) + (global-set-key [?\C-c ?w ?l] 'windmove-right) (global-set-key [?\C-c ?w ?w] 'mdw-set-frame-width) - (global-set-key [insertchar] 'overwrite-mode) + (global-set-key [?\C-c ?w up] 'windmove-up) + (global-set-key [?\C-c ?w down] 'windmove-down) + (global-set-key [?\C-c ?w left] 'windmove-left) + (global-set-key [?\C-c ?w right] 'windmove-right) + (global-set-key [?\C-h ?\C-m] 'manual-entry) (global-set-key [?\C-x ?\C-n] 'skel-create-file) (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window) (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame) - (global-set-key [delete] 'delete-char) + (global-set-key [?\C-x ?3] 'mdw-split-window-horizontally) + (global-set-key [?\C-x ?/] 'auto-fill-mode) + (global-set-key [?\M-#] 'calc-dispatch) (global-set-key [?\M-q] 'mdw-fill-paragraph) - (global-set-key [?\C-h ?\C-m] 'manual-entry) + (global-set-key [delete] 'delete-char) + (global-set-key [insertchar] 'overwrite-mode) (global-set-key [C-M-backspace] 'backward-kill-sexp) (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window) (global-set-key [vertical-scroll-bar C-down-mouse-1] @@ -690,8 +692,6 @@ #'(lambda () (interactive))) (global-set-key [M-S-mouse-3] 'imenu) (global-set-key [XF86WakeUp] "") - (global-set-key [?\C-c ?d ?w] 'devhelp-word-at-point) - (global-set-key [?\C-c ?d ?a] 'devhelp-assistant-word-at-point) (global-set-key [f11] 'mdw-toggle-full-screen) (and (not mdw-fast-startup) (fboundp 'hippie-expand) (global-set-key [?\M-?] 'hippie-expand))) -- [mdw]