mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 9100cd7bfa09a94c58cb02518f3a6a08e51e75fc Author: Matthew L. Fidler <[email protected]> Date: Wed Jun 25 13:56:51 2014 -0500 Fix image generation and autohotkey generation --- ergoemacs-theme-engine.el | 169 +++++++++++++++++++++++++-------------------- 1 files changed, 95 insertions(+), 74 deletions(-) diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el index f7e4daf..09f40cc 100644 --- a/ergoemacs-theme-engine.el +++ b/ergoemacs-theme-engine.el @@ -90,89 +90,110 @@ :group 'ergoemacs-theme) (defcustom ergoemacs-function-short-names - '((backward-char "← char") - (forward-char "→ char") - (previous-line "↑ line") - (next-line "↓ line") - (left-word "← word") - (right-word "→ word") + '( + (ace-jump-mode "Ace Jump") + (backward-char "← char") + (backward-kill-word "⌫ word") (backward-paragraph "↑ ¶") - (forward-paragraph "↓ ¶") (backward-word "← word") - (forward-word "→ word") + (comment-dwim "cmt dwim") + (delete-backward-char "⌫ char") + (delete-char "⌦ char") + (delete-frame "x Frame") + (delete-other-windows "x other pane") + (delete-other-windows "x other pane") + (delete-window "x pane") + (delete-window "x pane") + (er/contract-region "→ region ←") + (er/expand-region "←region→") + (er/expand-region "←region→") + (er/mark-outside-quotes "←quote→") (ergoemacs-backward-block "← ¶") - (ergoemacs-forward-block "→ ¶") + (ergoemacs-backward-open-bracket "← bracket") (ergoemacs-beginning-of-line-or-what "← line/*") - (ergoemacs-end-of-line-or-what "→ line/*") - (scroll-down "↑ page") - (scroll-down-command "↑ page") - (scroll-up-command "↓ page") - (scroll-up "↓ page") (ergoemacs-beginning-or-end-of-buffer "↑ Top*") + (ergoemacs-call-keyword-completion "↯ compl") + (ergoemacs-close-current-buffer "x Close Buffer") + (ergoemacs-compact-uncompact-block "fill/unfill ¶") + (ergoemacs-copy-all "copy all") + (ergoemacs-copy-all "copy all") + (ergoemacs-copy-line-or-region "copy") + (ergoemacs-ctl-c "Copy/Ctl+c") + (ergoemacs-ctl-x "Cut/Ctl+x") + (ergoemacs-cut-all "✂ all") + (ergoemacs-cut-all "✂ all") + (ergoemacs-cut-line-or-region "✂ region") + (ergoemacs-end-of-line-or-what "→ line/*") (ergoemacs-end-or-beginning-of-buffer "↓ Bottom*") - (ergoemacs-backward-open-bracket "← bracket") + (ergoemacs-extend-selection "←region→") + (ergoemacs-extend-selection "←region→") + (ergoemacs-forward-block "→ ¶") (ergoemacs-forward-close-bracket "→ bracket") - (isearch-forward "→ isearch") - (isearch-backward "← isearch") - (recenter-top-bottom "recenter") - (delete-backward-char "⌫ char") - (delete-char "⌦ char") - (backward-kill-word "⌫ word") - (kill-word "⌦ word") - (ergoemacs-cut-line-or-region "✂ region") - (ergoemacs-copy-line-or-region "copy") + (ergoemacs-kill-line-backward "⌫ line") + (ergoemacs-move-cursor-next-pane "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-paste "paste") (ergoemacs-paste-cycle "paste ↑") - (ergoemacs-copy-all "copy all") - (ergoemacs-cut-all "✂ all") - (undo-tree-redo "↷ redo") - (redo "↷ redo") - (undo "↶ undo") - (kill-line "⌦ line") - (ergoemacs-kill-line-backward "⌫ line") - (mark-paragraph "Mark Paragraph") + (ergoemacs-print-buffer-confirm "Print") + (ergoemacs-select-current-block "Sel. Block") + (ergoemacs-select-current-line "Sel. Line") + (ergoemacs-select-text-in-quote "←quote→") (ergoemacs-shrink-whitespaces "⌧ white") - (comment-dwim "cmt dwim") + (ergoemacs-switch-to-next-frame "next frame") + (ergoemacs-switch-to-previous-frame "prev frame") + (ergoemacs-text-scale-normal-size "Reset Zoom") (ergoemacs-toggle-camel-case "tog. camel") (ergoemacs-toggle-letter-case "tog. case") - (ergoemacs-call-keyword-completion "↯ compl") - (flyspell-auto-correct-word "flyspell") - (ergoemacs-compact-uncompact-block "fill/unfill ¶") - (set-mark-command "Set Mark") + (ergoemacs-unchorded-alt-modal "Alt+ Mode") + (ergoemacs-universal-argument "Ctrl+u") (execute-extended-command "M-x") - (shell-command "shell cmd") - (ergoemacs-move-cursor-next-pane "next pane") - (ergoemacs-move-cursor-previous-pane "prev pane") - (ergoemacs-switch-to-previous-frame "prev frame") - (ergoemacs-switch-to-next-frame "next frame") + (find-file "Open") + (flyspell-auto-correct-word "flyspell") + (forward-char "→ char") + (forward-paragraph "↓ ¶") + (forward-word "→ word") + (indent-region "indent-region") ;; Already in CUA + (isearch-backward "← isearch") + (isearch-forward "→ isearch") + (keyboard-quit "Stop Operation") + (kill-line "⌦ line") + (kill-word "⌦ word") + (left-word "← word") + (mark-paragraph "Mark Paragraph") + (mark-whole-buffer "Sel All") + (next-line "↓ line") + (previous-line "↑ line") + (query-replace "rep") (query-replace "rep") - (vr/query-replace "rep reg") (query-replace-regexp "rep reg") - (delete-other-windows "x other pane") - (delete-window "x pane") - (split-window-vertically "split |") - (split-window-right "split |") - (split-window-horizontally "split —") + (recenter-top-bottom "recenter") + (redo "↷ redo") + (revert-buffer "Revert") + (right-word "→ word") + (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 —") - (er/expand-region "←region→") - (ergoemacs-extend-selection "←region→") - (er/expand-region "←region→") - (ergoemacs-extend-selection "←region→") - (er/mark-outside-quotes "←quote→") - (ergoemacs-select-text-in-quote "←quote→") - (ergoemacs-select-current-block "Sel. Block") - (ergoemacs-select-current-line "Sel. Line") - (ace-jump-mode "Ace Jump") (delete-window "x pane") - (delete-other-windows "x other pane") + (split-window-horizontally "split —") + (split-window-right "split |") + (split-window-vertically "split |") (split-window-vertically "split —") - (query-replace "rep") - (ergoemacs-cut-all "✂ all") - (ergoemacs-copy-all "copy all") - (execute-extended-command "M-x") - (execute-extended-command "M-x") - (indent-region "indent-region") ;; Already in CUA - (set-mark-command "Set Mark") - (mark-whole-buffer "Sel All")) + (switch-to-buffer "Switch Buffer") + (text-scale-decrease "Zoom Out") + (text-scale-increase "Zoom In") + (undo "↶ undo") + (undo-tree-redo "↷ redo") + (vr/query-replace "rep reg") + (write-file "Save As") + ) "Ergoemacs short command names" :group 'ergoemacs-themes :type '(repeat :tag "Command abbreviation" @@ -2223,18 +2244,18 @@ If OFF is non-nil, turn off the options instead." (defun ergoemacs-get-variable-layout () "Get the old-style variable layout list for `ergoemacs-extras'." - (if (and ergoemacs-theme--object (not ergoemacs-get-variable-layout)) - (setq ergoemacs-get-variable-layout - (ergoemacs-variable-layout-list ergoemacs-theme--object)) - (setq ergoemacs-get-variable-layout nil)) + (unless ergoemacs-theme--object + (ergoemacs-theme-install)) + (setq ergoemacs-get-variable-layout + (ergoemacs-variable-layout-list ergoemacs-theme--object)) 'ergoemacs-get-variable-layout) (defun ergoemacs-get-fixed-layout () "Get the old-style fixed layout list for `ergoemacs-extras'." - (if (and ergoemacs-theme--object (not ergoemacs-get-fixed-layout)) - (setq ergoemacs-get-fixed-layout - (ergoemacs-fixed-layout-list ergoemacs-theme--object)) - (setq ergoemacs-get-fixed-layout nil)) + (unless ergoemacs-theme--object + (ergoemacs-theme-install)) + (setq ergoemacs-get-fixed-layout + (ergoemacs-fixed-layout-list ergoemacs-theme--object)) 'ergoemacs-get-fixed-layout) (defun ergoemacs-rm-key (keymap key)
