Emacs: Rename 'my-keys' to 'mickey'

The dash in 'my-keys' implied that 'my' is a suffix for other symbols,
which is not the case at the moment.
master
Pierre Neidhardt 2016-06-09 11:27:24 +02:00
parent 2096909097
commit 867616c7ba
3 changed files with 75 additions and 79 deletions

View File

@ -3,22 +3,18 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Global variables.
(defvar my-keys-minor-mode-map (make-keymap)
"Keymap for my-keys-minor-mode. See its docstring for more
(defvar mickey-minor-mode-map (make-keymap)
"Keymap for mickey-minor-mode. See its docstring for more
details.")
(define-minor-mode my-keys-minor-mode
"A minor mode so that all bindings assingned on the
my-keys-minor-mode-map override undesired major modes
bindings. We use a minor mode to override global keys. This is
also rather useful to list all personal global bindings: just
rgrep `my-keys-minor-mode-map' over `~/.emacs.d'.
(define-minor-mode mickey-minor-mode
"The mode's keymap allows for overriding all global and major mode keys.
To view where the bindings are set in your config files, lookup
`mickey-minor-mode-map' over it. Example:
Example: to assign some-function to C-i, use
(define-key my-keys-minor-mode-map (kbd \"C-i\") 'some-function)"
t " my-keys" 'my-keys-minor-mode-map)
(add-hook 'minibuffer-setup-hook (lambda () (my-keys-minor-mode 0)))
(define-key mickey-minor-mode-map (kbd \"C-i\") 'some-function)"
t " my-keys" 'mickey-minor-mode-map)
(add-hook 'minibuffer-setup-hook (lambda () (mickey-minor-mode 0)))
(defvar emacs-cache-folder "~/.cache/emacs/"
"Cache folder is everything we do not want to track along with
@ -162,10 +158,10 @@ Example: to assign some-function to C-i, use
;; Load the file at the new location.
(load mc/list-file t)
(global-unset-key (kbd "C-<down-mouse-1>"))
(define-key my-keys-minor-mode-map (kbd "C-<mouse-1>") 'mc/add-cursor-on-click)
(define-key my-keys-minor-mode-map (kbd "C-x M-r") 'mc/edit-lines)
(define-key my-keys-minor-mode-map (kbd "C-x M-m") 'mc/mark-more-like-this-extended)
(define-key my-keys-minor-mode-map (kbd "C-x M-l") 'mc/mark-all-like-this-dwim)
(define-key mickey-minor-mode-map (kbd "C-<mouse-1>") 'mc/add-cursor-on-click)
(define-key mickey-minor-mode-map (kbd "C-x M-r") 'mc/edit-lines)
(define-key mickey-minor-mode-map (kbd "C-x M-m") 'mc/mark-more-like-this-extended)
(define-key mickey-minor-mode-map (kbd "C-x M-l") 'mc/mark-all-like-this-dwim)
;; Search compatible with mc.
(require 'phi-search nil t))
@ -183,20 +179,20 @@ Example: to assign some-function to C-i, use
(setq helm-buffers-fuzzy-matching t)
(setq helm-imenu-fuzzy-match t)
(setq helm-M-x-fuzzy-match t)
(define-key my-keys-minor-mode-map (kbd "M-x") 'helm-M-x)
(define-key my-keys-minor-mode-map (kbd "C-x M-f") 'helm-imenu)
(define-key my-keys-minor-mode-map (kbd "C-x C-/") 'helm-find)
(define-key mickey-minor-mode-map (kbd "M-x") 'helm-M-x)
(define-key mickey-minor-mode-map (kbd "C-x M-f") 'helm-imenu)
(define-key mickey-minor-mode-map (kbd "C-x C-/") 'helm-find)
(when (require 'helm-fuzzy-find nil t)
(define-key my-keys-minor-mode-map (kbd "C-c C-/") 'helm-fuzzy-find))
(define-key my-keys-minor-mode-map (kbd "C-x C-f") 'helm-find-files)
(define-key my-keys-minor-mode-map (kbd "C-x C-d") 'helm-browse-project)
(define-key my-keys-minor-mode-map (kbd "C-x b") 'helm-buffers-list)
(define-key my-keys-minor-mode-map (kbd "C-x C-b") 'helm-mini)
(define-key my-keys-minor-mode-map (kbd "M-y") 'helm-show-kill-ring)
(define-key my-keys-minor-mode-map (kbd "C-x C-x") 'helm-all-mark-rings)
(define-key my-keys-minor-mode-map (kbd "C-x x") 'helm-mark-ring)
(define-key my-keys-minor-mode-map (kbd "M-s o") 'helm-occur)
(define-key my-keys-minor-mode-map (kbd "C-h a") 'helm-apropos)
(define-key mickey-minor-mode-map (kbd "C-c C-/") 'helm-fuzzy-find))
(define-key mickey-minor-mode-map (kbd "C-x C-f") 'helm-find-files)
(define-key mickey-minor-mode-map (kbd "C-x C-d") 'helm-browse-project)
(define-key mickey-minor-mode-map (kbd "C-x b") 'helm-buffers-list)
(define-key mickey-minor-mode-map (kbd "C-x C-b") 'helm-mini)
(define-key mickey-minor-mode-map (kbd "M-y") 'helm-show-kill-ring)
(define-key mickey-minor-mode-map (kbd "C-x C-x") 'helm-all-mark-rings)
(define-key mickey-minor-mode-map (kbd "C-x x") 'helm-mark-ring)
(define-key mickey-minor-mode-map (kbd "M-s o") 'helm-occur)
(define-key mickey-minor-mode-map (kbd "C-h a") 'helm-apropos)
(setq helm-follow-mode-persistent t)
(add-to-list 'helm-sources-using-default-as-input 'helm-source-man-pages))
@ -219,7 +215,7 @@ Example: to assign some-function to C-i, use
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; We need to put it at the end to make sure it doesn't get overriden by other
;; minor modes.
(my-keys-minor-mode 1)
(mickey-minor-mode 1)
;; Local hook. You can use it to set system specific variables, such as the
;; external web browser or pdf viewer. You can also backport feature for old

View File

@ -42,7 +42,7 @@ Regular math expression can be computed with calc."
(comment-or-uncomment-region
(progn (goto-char min) (line-beginning-position))
(progn (goto-char max) (line-end-position))))))
(define-key my-keys-minor-mode-map "\M-;" 'comment-or-uncomment-current-line-or-region)
(define-key mickey-minor-mode-map "\M-;" 'comment-or-uncomment-current-line-or-region)
;; (defcustom compilation-after-hook nil
;; "List of hook functions run by `compile-custom'."
@ -125,7 +125,7 @@ there's a region, all lines that region covers will be duplicated."
(setq end (point)))
(if auto-fill-p (auto-fill-mode))
(goto-char (+ origin (* (length region) arg) arg)))))
(define-key my-keys-minor-mode-map (kbd "C-x M-d") 'duplicate)
(define-key mickey-minor-mode-map (kbd "C-x M-d") 'duplicate)
(defun emacs-process-p (pid)
"If pid is the process ID of an emacs process, return t, else nil.
@ -245,13 +245,13 @@ it appears in the minibuffer prompt."
(insert (expand-file-name filename)))
(t
(insert filename))))
; (define-key my-keys-minor-mode-map "\C-x\M-f" 'insert-file-name)
; (define-key mickey-minor-mode-map "\C-x\M-f" 'insert-file-name)
(defun insert-symbol-at-point-in-regexp-search-ring ()
"Insert symbol at point in regexp search ring."
(interactive)
(add-to-history 'regexp-search-ring (find-tag-default-as-symbol-regexp)))
(define-key my-keys-minor-mode-map "\M-#" 'insert-symbol-at-point-in-regexp-search-ring)
(define-key mickey-minor-mode-map "\M-#" 'insert-symbol-at-point-in-regexp-search-ring)
(defun kill-all-buffers ()
"Kill all buffers, leaving *scratch* only."
@ -302,7 +302,7 @@ fallback to the mode provided in symbol DEFAULT."
(ignore-errors (forward-char))
(backward-word)
(mark-word arg allow-extend))))
(define-key my-keys-minor-mode-map (kbd "M-@") 'mark-word-from-beginning)
(define-key mickey-minor-mode-map (kbd "M-@") 'mark-word-from-beginning)
(defun move-border-left (arg)
"Move window border in a natural manner.
@ -314,7 +314,7 @@ Enlarge/Shrink by ARG columns, or 5 if arg is nil."
(interactive "P")
(if (= (count-windows) 2)
(move-border-left-or-right arg t)))
(define-key my-keys-minor-mode-map (kbd "M-(") 'move-border-left)
(define-key mickey-minor-mode-map (kbd "M-(") 'move-border-left)
(defun move-border-left-or-right (arg dir)
"Wrapper around move-border-left and move-border-right.
@ -331,7 +331,7 @@ If DIR is t, then move left, otherwise move right."
(interactive "P")
(if (= (count-windows) 2)
(move-border-left-or-right arg nil)))
(define-key my-keys-minor-mode-map (kbd "M-)") 'move-border-right)
(define-key mickey-minor-mode-map (kbd "M-)") 'move-border-right)
(defun page-count ()
"Return page count."
@ -405,7 +405,7 @@ WARNING: this may slow down editing on big files."
(set-visited-file-name new-name)
(set-buffer-modified-p nil)
(message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name))))))))
(define-key my-keys-minor-mode-map (kbd "C-x w") 'rename-buffer-and-file)
(define-key mickey-minor-mode-map (kbd "C-x w") 'rename-buffer-and-file)
(defun sanitize ()
"(Un)tabifies according to `indent-tabs-mode', indents and deletes trailing whitespace.
@ -429,7 +429,7 @@ Works on buffer or region. Requires `tabify-leading'."
(if last
(shell-command last)
(error "Shell command history is empty"))))
(define-key my-keys-minor-mode-map (kbd "C-M-!") 'shell-last-command)
(define-key mickey-minor-mode-map (kbd "C-M-!") 'shell-last-command)
(defun skeleton-make-markers ()
"Save last skeleton markers in a list.
@ -488,7 +488,7 @@ Do not fold case with \\[universal-argument] or non-nil ARG."
(set-window-start w1 s2)
(set-window-start w2 s1))
(other-window 1))
(define-key my-keys-minor-mode-map (kbd "C-x \\") 'swap-windows)
(define-key mickey-minor-mode-map (kbd "C-x \\") 'swap-windows)
(defun tabify-leading ()
"Call `tabify' on leading spaces only.
@ -514,7 +514,7 @@ Works on whole buffer if region is unactive."
(setq indent-tabs-mode nil))
(message "Indent using tabs")
(setq indent-tabs-mode t)))
; (define-key my-keys-minor-mode-map (kbd "C-x M-i") 'toggle-indent-tabs)
; (define-key mickey-minor-mode-map (kbd "C-x M-i") 'toggle-indent-tabs)
(defun toggle-trailing-whitespace ()
"Show trailing whitespace or not."
@ -535,7 +535,7 @@ from acting on it."
"Window '%s' is dedicated"
"Window '%s' is normal")
(current-buffer)))
(define-key my-keys-minor-mode-map [pause] 'toggle-window-dedicated)
(define-key mickey-minor-mode-map [pause] 'toggle-window-dedicated)
(defun toggle-window-split ()
"Switch between vertical and horizontal split.
@ -563,7 +563,7 @@ It only works for frames with exactly two windows."
(set-window-buffer (next-window) next-win-buffer)
(select-window first-win)
(if this-win-2nd (other-window 1))))))
(define-key my-keys-minor-mode-map (kbd "C-x C-\\") 'toggle-window-split)
(define-key mickey-minor-mode-map (kbd "C-x C-\\") 'toggle-window-split)
(defun toggle-word-delim ()
"Make underscore part of the word syntax or not.

View File

@ -9,7 +9,7 @@
(when (fboundp 'set-scroll-bar-mode)
(set-scroll-bar-mode 'left)
(scroll-bar-mode -1)
(define-key my-keys-minor-mode-map (kbd "C-<f6>") 'toggle-scroll-bar))
(define-key mickey-minor-mode-map (kbd "C-<f6>") 'toggle-scroll-bar))
;; Remember last cursor position.
(require 'saveplace)
@ -63,26 +63,26 @@
(setq kill-whole-line t)
;; Alternative scrolling
(define-key my-keys-minor-mode-map [next]
(define-key mickey-minor-mode-map [next]
(lambda () (interactive)
(if (string= major-mode "doc-view-mode")
(doc-view-next-page)
(condition-case nil (scroll-up)
(end-of-buffer (goto-char (point-max)))))))
(define-key my-keys-minor-mode-map [prior]
(define-key mickey-minor-mode-map [prior]
(lambda () (interactive)
(if (string= major-mode "doc-view-mode")
(doc-view-previous-page)
(condition-case nil (scroll-down)
(beginning-of-buffer (goto-char (point-min)))))))
(define-key my-keys-minor-mode-map (kbd "C-x M-n") (lambda () (interactive) (narrow-to-page 1)))
(define-key my-keys-minor-mode-map (kbd "C-x M-p") (lambda () (interactive) (narrow-to-page -1)))
(define-key mickey-minor-mode-map (kbd "C-x M-n") (lambda () (interactive) (narrow-to-page 1)))
(define-key mickey-minor-mode-map (kbd "C-x M-p") (lambda () (interactive) (narrow-to-page -1)))
;; Line numbers
(add-hook 'find-file-hook (lambda () (linum-mode 1)))
(define-key my-keys-minor-mode-map (kbd "C-<f5>") 'linum-mode)
(define-key mickey-minor-mode-map (kbd "C-<f5>") 'linum-mode)
(add-hook
'linum-before-numbering-hook
(lambda () (if (display-graphic-p) (setq linum-format "%d") (setq linum-format "%d "))))
@ -131,7 +131,7 @@
(page-number-mode t)
;; (whitespace-mode) ; This mode is a performance killer.
))
(define-key my-keys-minor-mode-map (kbd "C-<f7>") 'whitespace-mode)
(define-key mickey-minor-mode-map (kbd "C-<f7>") 'whitespace-mode)
(setq
whitespace-style
@ -147,10 +147,10 @@
; (add-hook 'before-save-hook 'sanitize)
;; Remove whitespaces on region, or whole file.
(define-key my-keys-minor-mode-map (kbd "C-\\") 'delete-trailing-whitespace)
(define-key mickey-minor-mode-map (kbd "C-\\") 'delete-trailing-whitespace)
;; Hippie expand.
;; (define-key my-keys-minor-mode-map (kbd "M-/") 'hippie-expand)
;; (define-key mickey-minor-mode-map (kbd "M-/") 'hippie-expand)
;; Abbreviation support
(setq-default abbrev-mode t)
@ -175,13 +175,13 @@
;; Default ispell dictionnay. If not set, Emacs uses the current locale.
(setq ispell-dictionary "english")
(define-key my-keys-minor-mode-map
(define-key mickey-minor-mode-map
(kbd "<f5>")
(lambda () (interactive) (ispell-change-dictionary "english")))
(define-key my-keys-minor-mode-map
(define-key mickey-minor-mode-map
(kbd "<f6>")
(lambda () (interactive) (ispell-change-dictionary "francais")))
(define-key my-keys-minor-mode-map
(define-key mickey-minor-mode-map
(kbd "<f7>")
(lambda () (interactive) (ispell-change-dictionary "svenska")))
@ -197,18 +197,18 @@
(setq show-paren-delay 0)
;; query-replace-regex fix on terminals.
(if (not (fboundp 'tool-bar-mode)) (define-key my-keys-minor-mode-map (kbd "C-M-y") 'query-replace-regexp))
(if (not (fboundp 'tool-bar-mode)) (define-key mickey-minor-mode-map (kbd "C-M-y") 'query-replace-regexp))
;; Semantic options.
;; (semantic-mode 1)
(setq semanticdb-default-save-directory (concat emacs-cache-folder "semanticdb"))
(define-key my-keys-minor-mode-map (kbd "C-c , d") 'semantic-ia-show-summary)
(define-key my-keys-minor-mode-map (kbd "C-, d") 'semantic-ia-show-summary)
(define-key my-keys-minor-mode-map (kbd "C-, g") 'semantic-symref-symbol)
(define-key my-keys-minor-mode-map (kbd "C-, G") 'semantic-symref)
(define-key my-keys-minor-mode-map (kbd "C-, j") 'semantic-complete-jump-local)
(define-key my-keys-minor-mode-map (kbd "C-, J") 'semantic-complete-jump)
(define-key my-keys-minor-mode-map (kbd "C-, l") 'semantic-analyze-possible-completions)
(define-key mickey-minor-mode-map (kbd "C-c , d") 'semantic-ia-show-summary)
(define-key mickey-minor-mode-map (kbd "C-, d") 'semantic-ia-show-summary)
(define-key mickey-minor-mode-map (kbd "C-, g") 'semantic-symref-symbol)
(define-key mickey-minor-mode-map (kbd "C-, G") 'semantic-symref)
(define-key mickey-minor-mode-map (kbd "C-, j") 'semantic-complete-jump-local)
(define-key mickey-minor-mode-map (kbd "C-, J") 'semantic-complete-jump)
(define-key mickey-minor-mode-map (kbd "C-, l") 'semantic-analyze-possible-completions)
;; Semantic with ghost display (allows M-n and M-p to browse completion).
;; (setq semantic-complete-inline-analyzer-displayor-class 'semantic-displayor-ghost)
;; (setq semantic-complete-inline-analyzer-displayor-class 'semantic-displayor-tooltip)
@ -219,7 +219,7 @@
;; (electric-pair-mode 1))
;; Run ranger asynchronously.
(define-key my-keys-minor-mode-map (kbd "C-x D")
(define-key mickey-minor-mode-map (kbd "C-x D")
(lambda () (interactive)
(let ((term (getenv "TERMCMD")))
(when (and (executable-find "ranger") (executable-find term))
@ -230,8 +230,8 @@
(setq calendar-date-style 'iso)
;; Quick buffer switching.
(define-key my-keys-minor-mode-map (kbd "C-<prior>") 'previous-buffer)
(define-key my-keys-minor-mode-map (kbd "C-<next>") 'next-buffer)
(define-key mickey-minor-mode-map (kbd "C-<prior>") 'previous-buffer)
(define-key mickey-minor-mode-map (kbd "C-<next>") 'next-buffer)
;; Remove auto-fill in web edits because wikis and forums do not like it.
;; This works for qutebrowser, but may need changes for other browsers.
@ -251,12 +251,12 @@
(require 'functions) ; for `compile-custom'
(setq compilation-ask-about-save nil)
(autoload 'recompile "compile" nil t)
(define-key my-keys-minor-mode-map (kbd "<f10>") 'compile-custom)
(define-key my-keys-minor-mode-map (kbd "<f11>") 'previous-error)
(define-key my-keys-minor-mode-map (kbd "<f12>") 'next-error)
(define-key mickey-minor-mode-map (kbd "<f10>") 'compile-custom)
(define-key mickey-minor-mode-map (kbd "<f11>") 'previous-error)
(define-key mickey-minor-mode-map (kbd "<f12>") 'next-error)
;; Code browsing: make C-M-e jump to next function instead of the end of the current function.
(define-key my-keys-minor-mode-map (kbd "C-M-e") (lambda () (interactive) (beginning-of-defun -1)))
(define-key mickey-minor-mode-map (kbd "C-M-e") (lambda () (interactive) (beginning-of-defun -1)))
;; Common LISP
(setq inferior-lisp-program "clisp")
@ -291,8 +291,8 @@
;; Do not expand abbrevs in skeletons.
(setq-default skeleton-further-elements '((abbrev-mode nil)))
(add-hook 'skeleton-end-hook 'skeleton-make-markers)
(define-key my-keys-minor-mode-map (kbd "C->") 'skeleton-next-position)
(define-key my-keys-minor-mode-map (kbd "C-<") (lambda () (interactive) (skeleton-next-position t)))
(define-key mickey-minor-mode-map (kbd "C->") 'skeleton-next-position)
(define-key mickey-minor-mode-map (kbd "C-<") (lambda () (interactive) (skeleton-next-position t)))
;; Alternate focus.
(add-hook 'occur-hook (lambda () (pop-to-buffer occur-buf)))
@ -345,13 +345,13 @@
(which-function-mode)
;; Replace maximized binding for fullscreen.
(define-key my-keys-minor-mode-map (kbd "M-<f10>") 'toggle-frame-fullscreen)
(define-key mickey-minor-mode-map (kbd "M-<f10>") 'toggle-frame-fullscreen)
;; Scroll zooming.
(define-key my-keys-minor-mode-map (kbd "C-<wheel-down>") 'text-scale-decrease)
(define-key my-keys-minor-mode-map (kbd "C-<mouse-5>") 'text-scale-decrease)
(define-key my-keys-minor-mode-map (kbd "C-<wheel-up>") 'text-scale-increase)
(define-key my-keys-minor-mode-map (kbd "C-<mouse-4>") 'text-scale-increase)
(define-key mickey-minor-mode-map (kbd "C-<wheel-down>") 'text-scale-decrease)
(define-key mickey-minor-mode-map (kbd "C-<mouse-5>") 'text-scale-decrease)
(define-key mickey-minor-mode-map (kbd "C-<wheel-up>") 'text-scale-increase)
(define-key mickey-minor-mode-map (kbd "C-<mouse-4>") 'text-scale-increase)
(setq text-scale-mode-step 1.1)
;; Sort
@ -384,5 +384,5 @@
; (dolist (error-or-warning (cadr menu-data))
; (push (car error-or-warning) messages))
; (message "%s" (mapconcat #'identity (reverse messages) "\n"))))))
; (define-key my-keys-minor-mode-map (kbd "C-<f10>")
; (define-key mickey-minor-mode-map (kbd "C-<f10>")
; 'flymake-display-err-message-for-current-line)