branch: externals/ergoemacs-mode
commit c48438970ef45427e6705c4954e0bed6a7790271
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Lots of tweaks to the help svg
---
ergoemacs-theme-engine.el | 115 ++++++++++++++++++++++++++--------------------
1 file changed, 66 insertions(+), 49 deletions(-)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 9feb811..d33cae0 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -474,24 +474,28 @@ See also `find-function-recenter-line' and
`find-function-after-hook'."
(defcustom ergoemacs-function-short-names
'(
- (abort-recursive-edit "Abort Edit")
- (ace-jump-mode "Ace Jump")
- (backward-char "← char")
+ (abort-recursive-edit "abort edit")
+ (ace-jump-mode "ace jump")
+ (backward-char "← char")
+ (back-to-indentation "← indent")
(backward-kill-word "⌫ word")
(backward-paragraph "↑ ¶")
(backward-word "← word")
- (bm-next "Next Bookmark")
- (bm-toggle "Toggle bookmark")
+ (bm-next "next bookmark")
+ (bm-toggle "toggle bookmark")
(comment-dwim "cmt dwim")
- (count-words-region "Count Words")
- (cua-set-mark "Set Mark")
+ (count-words-region "count words")
+ (cua-set-mark "set mark")
+ (delete-horizontal-space "⌫space⌦")
+ (default-indent-new-line "comment↵")
(delete-backward-char "⌫ char")
(delete-char "⌦ char")
- (delete-frame "x Frame")
- (delete-indentation "⌧ indentation")
+ (delete-frame "x frame")
+ (delete-indentation "⌧ indent")
(delete-other-windows "x other pane")
(delete-window "x pane")
- (digit-argument "#Argument")
+ (digit-argument "#arg")
+ (electric-newline-and-maybe-indent "enter↵")
(er/contract-region "→ region ←")
(er/expand-region "←region→")
(er/mark-outside-quotes "←quote→")
@@ -500,47 +504,47 @@ See also `find-function-recenter-line' and
`find-function-after-hook'."
(ergoemacs-beginning-of-line-or-what "← line/*")
(ergoemacs-beginning-or-end-of-buffer "↑ Top*")
(ergoemacs-call-keyword-completion "↯ compl")
- (ergoemacs-close-current-buffer "x Close Buffer")
- (universal-argument "Argument")
+ (ergoemacs-close-current-buffer "x buffer")
(ergoemacs-compact-uncompact-block "fill/unfill ¶")
(ergoemacs-copy-all "copy all")
(ergoemacs-copy-line-or-region "copy")
(ergoemacs-cut-all "✂ all")
(ergoemacs-cut-line-or-region "✂ region")
- (ergoemacs-delete-frame "Close Frame")
+ (ergoemacs-delete-frame "x frame")
(ergoemacs-end-of-line-or-what "→ line/*")
- (ergoemacs-end-or-beginning-of-buffer "↓ Bottom*")
+ (ergoemacs-end-or-beginning-of-buffer "↓ bottom*")
(ergoemacs-extend-selection "←region→")
(ergoemacs-forward-block "→ ¶")
(ergoemacs-forward-close-bracket "→ bracket")
(ergoemacs-kill-line-backward "⌫ line")
- (other-window "next pane")
(ergoemacs-move-cursor-previous-pane "prev pane")
- (ergoemacs-new-empty-buffer "New")
- (ergoemacs-open-in-external-app "OS Open")
- (ergoemacs-open-last-closed "Open Last Closed")
- (ergoemacs-org-edit-src "Edit Source")
+ (ergoemacs-make-frame-command "new frame")
+ (ergoemacs-new-empty-buffer "new buffer")
+ (ergoemacs-open-in-external-app "open extern")
+ (ergoemacs-open-last-closed "open last")
+ (ergoemacs-org-edit-src "edit source")
(ergoemacs-paste "paste")
(ergoemacs-paste-cycle "paste ↑")
- (pr-interface "Print")
- (ergoemacs-select-current-block "Sel. Block")
- (ergoemacs-select-current-line "Sel. Line")
+ (ergoemacs-revert-buffer "revert buf.")
+ (ergoemacs-select-current-block "sel. block")
+ (ergoemacs-select-current-line "sel. line")
(ergoemacs-select-text-in-quote "←quote→")
(ergoemacs-shrink-whitespaces "⌧ white")
(ergoemacs-switch-to-next-frame "next frame")
(ergoemacs-switch-to-previous-frame "prev frame")
- (ergoemacs-text-scale-normal-size "Reset Zoom")
+ (ergoemacs-text-scale-normal-size "reset zoom")
(ergoemacs-toggle-camel-case "tog. camel")
(ergoemacs-toggle-letter-case "tog. case")
- (execute-extended-command "M-x")
- (find-file "Open")
+ (eval-expression "eval expr")
+ (execute-extended-command "run cmd")
+ (find-file "open")
(flyspell-auto-correct-word "flyspell")
(forward-char "→ char")
(forward-paragraph "↓ ¶")
(forward-word "→ word")
- (goto-line "Goto line")
- (ido-write-file "Save As")
- (indent-for-tab-command "↹Tab")
+ (goto-line "goto line")
+ (ido-write-file "save as")
+ (indent-for-tab-command "↹tab")
(indent-region "indent-region") ;; Already in CUA
(insert-parentheses "()")
(isearch-backward "← isearch")
@@ -550,44 +554,56 @@ See also `find-function-recenter-line' and
`find-function-after-hook'."
(keyboard-quit "stop cmd")
(kill-line "⌦ line")
(kill-word "⌦ word")
+ (kmacro-start-macro-or-insert-counter "start macro")
+ (kmacro-end-or-call-macro "end/run mac.")
(left-word "← word")
- (make-frame-command "New Frame")
- (mark-paragraph "Sel ¶")
- (mark-whole-buffer "Sel All")
- (mc/edit-lines "Edit Lines")
- (mc/mark-next-like-this "Mark Next")
- (menu-bar-open "Menu bar")
- (move-past-close-and-reindent "→) ↹Tab")
- (negative-argument "-Argument")
- (newline-and-indent "Enter↵ Tab↹")
+ (make-frame-command "new frame")
+ (mark-paragraph "sel. ¶")
+ (mark-whole-buffer "sel. all")
+ (mc/edit-lines "edit lines")
+ (mc/mark-next-like-this "mark next")
+ (menu-bar-open "menu bar")
+ (move-beginning-of-line "← line")
+ (move-end-of-line "→ line")
+ (move-past-close-and-reindent "→) ↹tab")
+ (negative-argument "-arg")
+ (newline-and-indent "enter↵ tab↹")
(next-line "↓ line")
- (pr-interface)
+ (other-window "next pane")
+ (pr-interface "print")
(previous-line "↑ line")
(query-replace "rep")
(query-replace-regexp "rep reg")
+ (quoted-insert "ins. special")
(recenter-top-bottom "recenter")
(redo "↷ redo")
- (revert-buffer "Revert")
+ (revert-buffer "revert")
(right-word "→ word")
- (save-buffer "Save")
+ (save-buffer "save")
(scroll-down "↑ page")
(scroll-down-command "↑ page")
(scroll-up "↓ page")
(scroll-up-command "↓ page")
- (set-mark-command "Set Mark")
+ (set-mark-command "set mark")
(shell-command "shell cmd")
(split-window-below "split —")
(split-window-horizontally "split —")
(split-window-right "split |")
(split-window-vertically "split —")
- (switch-to-buffer "Switch Buffer")
- (text-scale-decrease "Zoom Out")
- (text-scale-increase "Zoom In")
+ (switch-to-buffer "switch buf.")
+ (text-scale-decrease "zoom out")
+ (text-scale-increase "zoom in")
+ (toggle-frame-fullscreen "fullscreen")
+ (toggle-frame-maximized "maximize")
+ (transpose-chars "transpose")
(undo "↶ undo")
(undo-tree-redo "↷ redo")
- (universal-argument "Argument")
+ (universal-argument "arg")
(vr/query-replace "rep reg")
- (write-file "Save As"))
+ (write-file "save as")
+ (xref-pop-marker-stack "xref pop")
+ (xref-find-definitions "xref find")
+ )
"Ergoemacs short command names."
:group 'ergoemacs-themes
:type '(repeat :tag "Command abbreviation"
@@ -691,17 +707,18 @@ See also `find-function-recenter-line' and
`find-function-after-hook'."
)
)
((memq elt '(meta control))
- (concat (ergoemacs-key-description--modifier elt) (format " - Emacs %s"
elt))
+ (concat (ergoemacs-key-description--modifier elt) (format " == %s" elt))
)
((memq elt '(meta-shift control-shift))
(setq elt (intern (replace-regexp-in-string "-shift" "" (symbol-name
elt))))
(concat (ergoemacs-key-description--modifier elt)
(ergoemacs-key-description--modifier 'shift)
- (format " - Emacs %s shift" elt)))
+ (format " == %s shift" elt)))
((eq elt 'apps)
(if ergoemacs-theme--svg-prefix
"Key without any modifiers"
- "▤ Menu/Apps"))
+ ""))
+ ;; ""))
((eq elt 'title)
(concat lay
(or (and ergoemacs-theme--svg-prefix
