branch: externals/ergoemacs-mode commit d2977244a56767ec95b82f2939b67a3090aff225 Author: Walter Landry <wlan...@caltech.edu> Commit: Walter Landry <wlan...@caltech.edu>
Remove ergoemacs-command-loop--modal and ergoemacs-command-loop--modal-show --- ergoemacs-command-loop.el | 32 -------------------------------- ergoemacs-map.el | 3 +-- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el index 7bcfda9..299eaa2 100644 --- a/ergoemacs-command-loop.el +++ b/ergoemacs-command-loop.el @@ -184,38 +184,6 @@ ignore the post-command hooks.") (defvar ergoemacs-keymap) -(defun ergoemacs-command-loop--modal-show () - "Show modal translation. -Returns the mode-line text." - (let (tmp color text) - (ergoemacs-save-buffer-state - (cond - ((setq tmp nil) - (setq color (ergoemacs-translation-struct-modal-color tmp)) - (if color - (set-cursor-color color) - (when ergoemacs-default-cursor-color - (set-cursor-color ergoemacs-default-cursor-color))) - (setq text (ergoemacs-translation-struct-text tmp)) - (when (functionp text) - (setq text (funcall text))) - (if text - (ergoemacs-mode-line ;; Indicate Alt+ in mode-line - text) - (ergoemacs-mode-line)) - (or text "Unnamed")) - (t - (when ergoemacs-default-cursor-color - (set-cursor-color ergoemacs-default-cursor-color)) - (ergoemacs-mode-line) - nil))))) - -(defun ergoemacs-command-loop--modal (type) - "Toggle ergoemacs command modes. - -The TYPE is the type of command translation/modal keymaps that are installed." - nil) - (defun ergoemacs-command-loop--redefine-quit-key (&optional key) "Redefines the quit-key in Emacs to KEY or Ctrl+g. diff --git a/ergoemacs-map.el b/ergoemacs-map.el index 8702952..4c5505a 100644 --- a/ergoemacs-map.el +++ b/ergoemacs-map.el @@ -68,7 +68,6 @@ (declare-function ergoemacs-warn "ergoemacs-lib") (declare-function ergoemacs-setcdr "ergoemacs-lib") -(declare-function ergoemacs-command-loop--modal "ergoemacs-command-loop") (declare-function ergoemacs-command-loop--spinner-display "ergoemacs-command-loop") (declare-function ergoemacs-component-struct--create-hooks "ergoemacs-component") @@ -897,7 +896,7 @@ modifications to that keymap." ((memq 'add-keymap-witness lookup-keymap) ;; Don't translate complete tranisent maps. lookup-keymap) ((and lookup-keymap (symbolp lookup-keymap) (ergoemacs-gethash lookup-keymap ergoemacs-translation-hash)) - (ergoemacs-command-loop--modal lookup-keymap)) + nil) ((consp (ergoemacs lookup-keymap :map-key)) ;; Ignore already installed. lookup-keymap) ((and lookup-keymap (ergoemacs lookup-keymap :dont-modify-p))