branch: externals/ergoemacs-mode commit 96cb33de6f47539c98f2237b5f44c4e8aa404d67 Author: Walter Landry <wlan...@caltech.edu> Commit: Walter Landry <wlan...@caltech.edu>
Remove ergoemacs-command-loop--modal-p --- ergoemacs-command-loop.el | 7 +------ ergoemacs-macros.el | 2 +- ergoemacs-translate.el | 2 -- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el index 91b2086..3159484 100644 --- a/ergoemacs-command-loop.el +++ b/ergoemacs-command-loop.el @@ -213,11 +213,6 @@ Returns the mode-line text." (ergoemacs-mode-line) nil))))) -(defun ergoemacs-command-loop--modal-p () - "Determine if the command should be modal. -If so return the translation." - nil) - (defun ergoemacs-command-loop--modal (type) "Toggle ergoemacs command modes. @@ -268,7 +263,7 @@ This is called through `ergoemacs-command-loop'" ;; Command loop hasn't started. (setq current-prefix-arg '(4)) (setq ergoemacs-command-loop-start t) - (ergoemacs-command-loop nil (ergoemacs-command-loop--modal-p) nil t)) + (ergoemacs-command-loop nil nil nil t)) ((not current-prefix-arg) (setq current-prefix-arg '(4) ergoemacs-command-loop--universal t diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el index 66193e3..8ddf345 100644 --- a/ergoemacs-macros.el +++ b/ergoemacs-macros.el @@ -707,7 +707,7 @@ When arg1 can be a property. The following properties are supported: ((and arg1 (symbolp arg1) (eq arg1 :user-after) (not arg2) (not arg3)) `(ergoemacs-map-properties--before-ergoemacs t)) ((and arg1 (symbolp arg1) (eq arg1 :modal-p)) - `(ergoemacs-command-loop--modal-p)) + nil) ((and arg1 (symbolp arg1) (eq arg1 :combine) arg2 arg3) `(ergoemacs-command-loop--combine ,arg2 ,arg3)) ((and arg1 (symbolp arg1) (memq arg1 '(:unicode-or-alt :unicode))) diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el index 2659479..d82529c 100644 --- a/ergoemacs-translate.el +++ b/ergoemacs-translate.el @@ -87,8 +87,6 @@ (declare-function ergoemacs-map-- "ergoemacs-map") -(declare-function ergoemacs-command-loop--modal-p "ergoemacs-command-loop") - (declare-function ergoemacs-translate--key-description "ergoemacs-translate") (fset #'ergoemacs-translate--key-description (symbol-function #'key-description))