branch: externals/ergoemacs-mode commit 3e25eacc435ed7f405c280a5fd7dd5e8a0670e12 Author: Walter Landry <wlan...@caltech.edu> Commit: Walter Landry <wlan...@caltech.edu>
Remove unused modal customizations --- ergoemacs-command-loop.el | 2 - ergoemacs-macros.el | 3 +- ergoemacs-mode.el | 138 ---------------------------------------------- 3 files changed, 1 insertion(+), 142 deletions(-) diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el index 955ef50..925e282 100644 --- a/ergoemacs-command-loop.el +++ b/ergoemacs-command-loop.el @@ -89,8 +89,6 @@ (defvar ergoemacs-default-cursor-color) (defvar ergoemacs-echo-function) (defvar ergoemacs-map--quit-map) -(defvar ergoemacs-modal-emacs-state-modes) -(defvar ergoemacs-modal-ignored-buffers) (defvar ergoemacs-modal-ignored-keymap) (defvar ergoemacs-mode-started-p) (defvar guide-key/guide-key-sequence) diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el index 9bea54e..ee8c41a 100644 --- a/ergoemacs-macros.el +++ b/ergoemacs-macros.el @@ -780,8 +780,7 @@ When arg1 can be a property. The following properties are supported: :keymap -- Local Keymap for translation :keymap-modal -- Modal keymap for overrides. :modal-always -- If the modal state is always on, regardless of - the values of `ergoemacs-modal-ignored-buffers', - `ergoemacs-modal-emacs-state-modes' `minibufferp' + the values of `minibufferp' The following arguments allow the keyboard presses to be translated: - :meta - :control diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el index abc3985..39e9a5a 100644 --- a/ergoemacs-mode.el +++ b/ergoemacs-mode.el @@ -1002,15 +1002,6 @@ Valid values are: :group 'ergoemacs-command-loop) -(defgroup ergoemacs-modal nil - "Modal `ergoemacs-mode'." - :group 'ergoemacs-mode) -(defcustom ergoemacs-modal-ignored-buffers - '("^ \\*load\\*" "^[*]e?shell[*]" "^[*]R.*[*]$") - "Buffers where modal ergoemacs-mode is ignored." - :type '(repeat string) - :group 'ergoemacs-modal) - (defcustom ergoemacs-default-cursor-color nil "Default cursor color. @@ -1023,135 +1014,6 @@ color. Otherwise this will be nil A color string as passed to (define-obsolete-variable-alias 'ergoemacs-default-cursor 'ergoemacs-default-cursor-color) -(defcustom ergoemacs-modal-emacs-state-modes - '(archive-mode - bbdb-mode - bookmark-bmenu-mode - bookmark-edit-annotation-mode - browse-kill-ring-mode - bzr-annotate-mode - calc-mode - cfw:calendar-mode - completion-list-mode - Custom-mode - debugger-mode - delicious-search-mode - desktop-menu-blist-mode - desktop-menu-mode - doc-view-mode - dvc-bookmarks-mode - dvc-diff-mode - dvc-info-buffer-mode - dvc-log-buffer-mode - dvc-revlist-mode - dvc-revlog-mode - dvc-status-mode - dvc-tips-mode - ediff-mode - ediff-meta-mode - efs-mode - Electric-buffer-menu-mode - emms-browser-mode - emms-mark-mode - emms-metaplaylist-mode - emms-playlist-mode - etags-select-mode - fj-mode - gc-issues-mode - gdb-breakpoints-mode - gdb-disassembly-mode - gdb-frames-mode - gdb-locals-mode - gdb-memory-mode - gdb-registers-mode - gdb-threads-mode - gist-list-mode - gnus-article-mode - gnus-browse-mode - gnus-group-mode - gnus-server-mode - gnus-summary-mode - google-maps-static-mode - ibuffer-mode - jde-javadoc-checker-report-mode - magit-commit-mode - magit-diff-mode - magit-key-mode - magit-log-mode - magit-mode - magit-reflog-mode - magit-show-branches-mode - magit-branch-manager-mode ;; New name for magit-show-branches-mode - magit-stash-mode - magit-status-mode - magit-wazzup-mode - mh-folder-mode - monky-mode - notmuch-hello-mode - notmuch-search-mode - notmuch-show-mode - occur-mode - org-agenda-mode - package-menu-mode - proced-mode - rcirc-mode - rebase-mode - recentf-dialog-mode - reftex-select-bib-mode - reftex-select-label-mode - reftex-toc-mode - sldb-mode - slime-inspector-mode - slime-thread-control-mode - slime-xref-mode - shell-mode - sr-buttons-mode - sr-mode - sr-tree-mode - sr-virtual-mode - tar-mode - tetris-mode - tla-annotate-mode - tla-archive-list-mode - tla-bconfig-mode - tla-bookmarks-mode - tla-branch-list-mode - tla-browse-mode - tla-category-list-mode - tla-changelog-mode - tla-follow-symlinks-mode - tla-inventory-file-mode - tla-inventory-mode - tla-lint-mode - tla-logs-mode - tla-revision-list-mode - tla-revlog-mode - tla-tree-lint-mode - tla-version-list-mode - twittering-mode - urlview-mode - vc-annotate-mode - vc-dir-mode - vc-git-log-view-mode - vc-svn-log-view-mode - vm-mode - vm-summary-mode - w3m-mode - wab-compilation-mode - xgit-annotate-mode - xgit-changelog-mode - xgit-diff-mode - xgit-revlog-mode - xhg-annotate-mode - xhg-log-mode - xhg-mode - xhg-mq-mode - xhg-mq-sub-mode - xhg-status-extra-mode) - "Modes that should come up in `ergoemacs-mode' state." - :type '(repeat symbol) - :group 'ergoemacs-modal) - (defvar ergoemacs-modal-list '()) (defvar ergoemacs-translate--translation-hash) (defvar ergoemacs-modal-ignored-keymap