branch: externals/ergoemacs-mode
commit d10087ffe1bdbcbdd69443a6eab03099765b09e4
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Remove ergoemacs macro :reset and :set-selection
---
ergoemacs-command-loop.el | 10 ----------
ergoemacs-functions.el | 3 +--
ergoemacs-macros.el | 6 ------
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index e62a01a..a8bbb22 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -557,16 +557,6 @@ Fix this issue."
(ignore-errors (switch-to-buffer (window-buffer) t t))
(goto-char (window-point))))
-(defun ergoemacs-command-loop--update-primary-selection ()
- "Update primary clipboard in X based systems."
- (when (and mouse-drag-copy-region
- (eventp last-command-event)
- (consp last-command-event)
- (memq (event-basic-type (car last-command-event))
- '(mouse-1))
- (region-active-p))
- (ergoemacs :set-selection 'PRIMARY (buffer-substring-no-properties
(region-beginning) (region-end)))))
-
(defun ergoemacs-command-loop--mouse-command-drop-first (args &optional
fn-arg-p)
"Internal function for processing mouse commands.
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index f2b9bb8..545c2ad 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -1902,8 +1902,7 @@ initial pair in the unread command events."
(setq last-input-event tmp)
(setq prefix-arg current-prefix-arg)
(setq unread-command-events (append (listify-key-sequence tmp)
unread-command-events))
- ;;(ergoemacs-defer-post-command-hook)
- (ergoemacs :reset-prefix))
+ (prefix-command-preserve-state))
(if (region-active-p)
(let ((p1 (region-beginning))
(p2 (region-end)))
diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index c0a0438..5cec912 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -207,12 +207,6 @@ When arg1 can be a property. The following properties are
supported:
(arg3 (nth 2 args))
(arg4 (nth 3 args)))
(cond
- ((and arg1 (symbolp arg1) (eq arg1 :reset-prefix))
- `(prefix-command-preserve-state))
- ((and arg1 (symbolp arg1) (eq arg1 :set-selection))
- `(gui-set-selection ,@(cdr args)))
- ((and arg1 (symbolp arg1) (eq arg1 :set-selection))
- `(gui-set-selection ,@(cdr args)))
((and arg1 (symbolp arg1) (eq arg1 :custom-p) (symbolp arg2))
(if (fboundp 'custom-variable-p)
`(custom-variable-p ,arg2)
