emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

map!: remove buffer-local :desc properties

Browse source 
which-key labels are registered globally, and will not work for
buffer-local keybinds. Until general is brought in, we'll have to suffer
label-less localleader keybinds.
This commit is contained in:
Henrik Lissner 2018-10-07 21:32:42 -04:00
parent f0465f22cc
commit cdf745e72a
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
6 changed files with 117 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/app/irc/config.el
View file

@ -121,21 +121,20 @@ playback.")
;; distinguish chat/channel buffers from server buffers. ;; distinguish chat/channel buffers from server buffers.
(add-hook 'circe-chat-mode-hook #'solaire-mode)) (add-hook 'circe-chat-mode-hook #'solaire-mode))
(map! (map! :localleader
(:localleader (:map circe-mode-map
(:map circe-mode-map :n "a" #'tracking-next-buffer
:desc "Next active buffer" :n "a" #'tracking-next-buffer :n "j" #'circe-command-JOIN
:desc "Join channel" :n "j" #'circe-command-JOIN :n "m" #'+irc/send-message
:desc "Send private message" :n "m" #'+irc/send-message :n "p" #'circe-command-PART
:desc "Part current channel" :n "p" #'circe-command-PART :n "Q" #'+irc/quit
:desc "Quit irc" :n "Q" #'+irc/quit :n "R" #'circe-reconnect
:desc "Reconnect" :n "R" #'circe-reconnect
(:when (featurep! :completion ivy) (:when (featurep! :completion ivy)
:desc "Jump to channel" :n "c" #'+irc/ivy-jump-to-channel)) :n "c" #'+irc/ivy-jump-to-channel))
(:map circe-channel-mode-map (:map circe-channel-mode-map
:desc "Show names" :n "n" #'circe-command-NAMES)))) :n "n" #'circe-command-NAMES)))
(def-package! circe-color-nicks (def-package! circe-color-nicks

2
modules/lang/clojure/config.el
View file

@ -40,7 +40,7 @@
:config :config
(map! :map clj-refactor-map (map! :map clj-refactor-map
:localleader :localleader
:desc "Refactor hydra" :n "r" #'hydra-cljr-help-menu/body)) :n "r" #'hydra-cljr-help-menu/body))
(def-package! flycheck-joker (def-package! flycheck-joker
:when (featurep! :feature syntax-checker) :when (featurep! :feature syntax-checker)

98
modules/lang/common-lisp/config.el
View file

@ -59,58 +59,56 @@ bin/doom while packages at compile-time (not a runtime though)."
(advice-remove #'sly-check-version #'+common-lisp*refresh-sly-version)) (advice-remove #'sly-check-version #'+common-lisp*refresh-sly-version))
(advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version) (advice-add #'sly-check-version :before #'+common-lisp*refresh-sly-version)
;; FIXME Buffer/mode-local :desc's don't work yet
(map! :map sly-mode-map (map! :map sly-mode-map
:localleader :localleader
:desc "Start Sly" :n "'" #'sly :n "'" #'sly
(:desc "help" :prefix "h" :n "g" #'+common-lisp/navigation/body
:desc "Apropos" :n "a" #'sly-apropos (:prefix "h"
:desc "Who binds" :n "b" #'sly-who-binds :n "a" #'sly-apropos
:desc "Disassemble symbol" :n "d" #'sly-disassemble-symbol :n "b" #'sly-who-binds
:desc "Describe symbol" :n "h" #'sly-describe-symbol :n "d" #'sly-disassemble-symbol
:desc "HyperSpec lookup" :n "H" #'sly-hyperspec-lookup :n "h" #'sly-describe-symbol
:desc "Who macroexpands" :n "m" #'sly-who-macroexpands :n "H" #'sly-hyperspec-lookup
:desc "Apropos package" :n "p" #'sly-apropos-package :n "m" #'sly-who-macroexpands
:desc "Who references" :n "r" #'sly-who-references :n "p" #'sly-apropos-package
:desc "Who specializes" :n "s" #'sly-who-specializes :n "r" #'sly-who-references
:desc "Who sets" :n "S" #'sly-who-sets :n "s" #'sly-who-specializes
:desc "Who calls" :n "<" #'sly-who-calls :n "S" #'sly-who-sets
:desc "Calls who" :n ">" #'sly-calls-who) :n "<" #'sly-who-calls
(:desc "compile" :prefix "c" :n ">" #'sly-calls-who)
:desc "Compile file" :n "c" #'sly-compile-file (:prefix "c"
:desc "Compile/load file" :n "C" #'sly-compile-and-load-file :n "c" #'sly-compile-file
:desc "Compile defun" :n "f" #'sly-compile-defun :n "C" #'sly-compile-and-load-file
:desc "Load file" :n "l" #'sly-load-file :n "f" #'sly-compile-defun
:desc "Remove notes" :n "n" #'sly-remove-notes :n "l" #'sly-load-file
:desc "Compile region" :n "r" #'sly-compile-region) :n "n" #'sly-remove-notes
(:desc "evaluate" :prefix "e" :n "r" #'sly-compile-region)
:desc "Evaluate buffer" :n "b" #'sly-eval-buffer (:prefix "e"
:desc "Evaluate last expression" :n "e" #'sly-eval-last-expression :n "b" #'sly-eval-buffer
:desc "Evaluate/print last expression" :n "E" #'sly-eval-print-last-expression :n "e" #'sly-eval-last-expression
:desc "Evaluate defun" :n "f" #'sly-eval-defun :n "E" #'sly-eval-print-last-expression
:desc "Undefine function" :n "F" #'sly-undefine-function :n "f" #'sly-eval-defun
:desc "Evaluate region" :n "r" #'sly-eval-region) :n "F" #'sly-undefine-function
(:desc "go" :n "g" #'+common-lisp/navigation/body) :n "r" #'sly-eval-region)
(:desc "macro" :prefix "m" (:prefix "m"
:desc "Macro-expand 1 level" :n "e" #'sly-macroexpand-1 :n "e" #'macrostep-expand
:desc "Macro-expand all" :n "E" #'sly-macroexpand-all :n "E" #'+common-lisp/macrostep/body)
:desc "Macro stepper" :n "s" #'+common-lisp/macrostep/body) (:prefix "r"
(:desc "repl" :prefix "r" :n "c" #'sly-mrepl-clear-repl
:desc "Clear REPL" :n "c" #'sly-mrepl-clear-repl :n "q" #'sly-quit-lisp
:desc "Quit Lisp" :n "q" #'sly-quit-lisp :n "r" #'sly-restart-inferior-lisp
:desc "Restart Lisp" :n "r" #'sly-restart-inferior-lisp :n "s" #'sly-mrepl-sync)
:desc "Sync REPL" :n "s" #'sly-mrepl-sync) (:prefix "s"
(:desc "stickers" :prefix "s" :n "b" #'sly-stickers-toggle-break-on-stickers
:desc "Toggle break on sticker" :n "b" #'sly-stickers-toggle-break-on-stickers :n "c" #'sly-stickers-clear-defun-stickers
:desc "Clear defun stickers" :n "c" #'sly-stickers-clear-defun-stickers :n "C" #'sly-stickers-clear-buffer-stickers
:desc "Clear buffer stickers" :n "C" #'sly-stickers-clear-buffer-stickers :n "f" #'sly-stickers-fetch
:desc "Fetch sticker recordings" :n "f" #'sly-stickers-fetch :n "r" #'sly-stickers-replay
:desc "Replay sticker recordings" :n "r" #'sly-stickers-replay :n "s" #'sly-stickers-dwim)
:desc "Add/remove stickers" :n "s" #'sly-stickers-dwim) (:prefix "t"
(:desc "trace" :prefix "t" :n "t" #'sly-toggle-trace-fdefinition
:desc "Toggle tracing" :n "t" #'sly-toggle-trace-fdefinition :n "T" #'sly-toggle-fancy-trace
:desc "Toggle fancy tracing" :n "T" #'sly-toggle-fancy-trace :n "u" #'sly-untrace-all))
:desc "Un-trace all" :n "u" #'sly-untrace-all))
;; Since `evil-collection-slime' exists, but not `evil-collection-sly', we ;; Since `evil-collection-slime' exists, but not `evil-collection-sly', we
;; simply copy it ;; simply copy it

2
modules/lang/org/config.el
View file

@ -361,7 +361,7 @@ between the two."
:localleader :localleader
:n "d" #'org-deadline :n "d" #'org-deadline
:n "t" #'org-todo :n "t" #'org-todo
(:desc "clock" :prefix "c" (:prefix "c"
:n "c" #'org-clock-in :n "c" #'org-clock-in
:n "C" #'org-clock-out :n "C" #'org-clock-out
:n "g" #'org-clock-goto :n "g" #'org-clock-goto

6
modules/lang/rest/config.el
View file

@ -22,9 +22,9 @@
:n "zr" #'outline-show-all :n "zr" #'outline-show-all
:localleader :localleader
:desc "Execute HTTP request" :n "e" #'restclient-http-send-current :n "e" #'restclient-http-send-current
:desc "Execute raw HTTP request" :n "E" #'restclient-http-send-current-raw :n "E" #'restclient-http-send-current-raw
:desc "Copy curl command" :n "c" #'restclient-copy-curl-command)) :n "c" #'restclient-copy-curl-command))
(def-package! company-restclient (def-package! company-restclient

104
modules/lang/web/+html.el
View file

@ -64,62 +64,62 @@
:desc "Rehighlight buffer" :n "h" #'web-mode-buffer-highlight :desc "Rehighlight buffer" :n "h" #'web-mode-buffer-highlight
:desc "Indent buffer" :n "i" #'web-mode-buffer-indent :desc "Indent buffer" :n "i" #'web-mode-buffer-indent
(:desc "attribute" :prefix "a" (:prefix "a"
:desc "Beginning" :n "b" #'web-mode-attribute-beginning :n "b" #'web-mode-attribute-beginning
:desc "End" :n "e" #'web-mode-attribute-end :n "e" #'web-mode-attribute-end
:desc "Insert" :n "i" #'web-mode-attribute-insert :n "i" #'web-mode-attribute-insert
:desc "Next" :n "n" #'web-mode-attribute-next :n "n" #'web-mode-attribute-next
:desc "Select" :n "s" #'web-mode-attribute-select :n "s" #'web-mode-attribute-select
:desc "Kill" :n "k" #'web-mode-attribute-kill :n "k" #'web-mode-attribute-kill
:desc "Previous" :n "p" #'web-mode-attribute-previous :n "p" #'web-mode-attribute-previous
:desc "Transpose" :n "p" #'web-mode-attribute-transpose) :n "p" #'web-mode-attribute-transpose)
(:desc "block" :prefix "b" (:prefix "b"
:desc "Beginning" :n "b" #'web-mode-block-beginning :n "b" #'web-mode-block-beginning
:desc "Close" :n "c" #'web-mode-block-close :n "c" #'web-mode-block-close
:desc "End" :n "e" #'web-mode-block-end :n "e" #'web-mode-block-end
:desc "Kill" :n "k" #'web-mode-block-kill :n "k" #'web-mode-block-kill
:desc "Next" :n "n" #'web-mode-block-next :n "n" #'web-mode-block-next
:desc "Previous" :n "p" #'web-mode-block-previous :n "p" #'web-mode-block-previous
:desc "Select" :n "s" #'web-mode-block-select) :n "s" #'web-mode-block-select)
(:desc "dom" :prefix "d" (:prefix "d"
:desc "Replace apostrophes" :n "a" #'web-mode-dom-apostrophes-replace :n "a" #'web-mode-dom-apostrophes-replace
:desc "Show errors" :n "d" #'web-mode-dom-errors-show :n "d" #'web-mode-dom-errors-show
:desc "Replace entities" :n "e" #'web-mode-dom-entities-encode :n "e" #'web-mode-dom-entities-encode
:desc "Normalize" :n "n" #'web-mode-dom-normalize :n "n" #'web-mode-dom-normalize
:desc "Replace quotes" :n "q" #'web-mode-dom-quotes-replace :n "q" #'web-mode-dom-quotes-replace
:desc "Traverse" :n "t" #'web-mode-dom-traverse :n "t" #'web-mode-dom-traverse
:desc "XPath" :n "x" #'web-mode-dom-xpath) :n "x" #'web-mode-dom-xpath)
(:desc "element" :prefix "e" (:prefix "e"
:desc "Close" :n "/" #'web-mode-element-close :n "/" #'web-mode-element-close
:desc "Select content" :n "a" #'web-mode-element-content-select :n "a" #'web-mode-element-content-select
:desc "Beginning" :n "b" #'web-mode-element-beginning :n "b" #'web-mode-element-beginning
:desc "Close" :n "c" #'web-mode-element-clone :n "c" #'web-mode-element-clone
:desc "Child" :n "d" #'web-mode-element-child :n "d" #'web-mode-element-child
:desc "End" :n "e" #'web-mode-element-end :n "e" #'web-mode-element-end
:desc "Toggle fold" :n "f" #'web-mode-element-children-fold-or-unfold :n "f" #'web-mode-element-children-fold-or-unfold
:desc "Insert" :n "i" #'web-mode-element-insert :n "i" #'web-mode-element-insert
:desc "Kill" :n "k" #'web-mode-element-kill :n "k" #'web-mode-element-kill
:desc "Mute blanks" :n "m" #'web-mode-element-mute-blanks :n "m" #'web-mode-element-mute-blanks
:desc "Next" :n "n" #'web-mode-element-next :n "n" #'web-mode-element-next
:desc "Previous" :n "p" #'web-mode-element-previous :n "p" #'web-mode-element-previous
:desc "Rename" :n "r" #'web-mode-element-rename :n "r" #'web-mode-element-rename
:desc "Select" :n "s" #'web-mode-element-select :n "s" #'web-mode-element-select
:desc "Transpose" :n "t" #'web-mode-element-transpose :n "t" #'web-mode-element-transpose
:desc "Parent" :n "u" #'web-mode-element-parent :n "u" #'web-mode-element-parent
:desc "Vanish" :n "v" #'web-mode-element-vanish :n "v" #'web-mode-element-vanish
:desc "Wrap" :n "w" #'web-mode-element-wrap) :n "w" #'web-mode-element-wrap)
(:desc "tag" :prefix "t" (:prefix "t"
:desc "Sort attributes" :n "a" #'web-mode-tag-attributes-sort :n "a" #'web-mode-tag-attributes-sort
:desc "Beginning" :n "b" #'web-mode-tag-beginning :n "b" #'web-mode-tag-beginning
:desc "End" :n "e" #'web-mode-tag-end :n "e" #'web-mode-tag-end
:desc "Match" :n "m" #'web-mode-tag-match :n "m" #'web-mode-tag-match
:desc "Next" :n "n" #'web-mode-tag-next :n "n" #'web-mode-tag-next
:desc "Previous" :n "p" #'web-mode-tag-previous :n "p" #'web-mode-tag-previous
:desc "Select" :n "s" #'web-mode-tag-select)) :n "s" #'web-mode-tag-select))
"M-/" #'web-mode-comment-or-uncomment "M-/" #'web-mode-comment-or-uncomment
:i "SPC" #'self-insert-command :i "SPC" #'self-insert-command