[elpa] externals/ergoemacs-mode 99d8eb99e8 1/7: More no-record changes

[ELPA Syncer]

branch: externals/ergoemacs-mode
commit 99d8eb99e8f697472b18aa4ddd3cb0ac977f5aca
Author: Matthew Fidler <matthew.fidler@gmail.com>
Commit: Matthew Fidler <matthew.fidler@gmail.com>

    More no-record changes
---
 ergoemacs-cua.el       |  6 +++---
 ergoemacs-functions.el | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ergoemacs-cua.el b/ergoemacs-cua.el
index aea0b38254..f20d9d632c 100644
--- a/ergoemacs-cua.el
+++ b/ergoemacs-cua.el
@@ -223,9 +223,9 @@ REPEAT is the flag that tells it if is repeated 
environmennt."
     
     ;; Push the key back on the event queue
     (if (version< emacs-version "26.2")
-        (setq unread-command-events (cons (cons 'no-record key)
-                                          unread-command-events))
-      (setq unread-command-events (cons key unread-command-events)))))
+        (setq unread-command-events (cons key unread-command-events))
+      (setq unread-command-events (cons (cons 'no-record key)
+                                        unread-command-events)))))
 
 
 (defun ergoemacs--prefix-override-handler ()
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index cec7d7e34a..3227fb9384 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -115,13 +115,22 @@ KEY3 is the optional third key in the sequence."
   (ergoemacs-prefix-command-preserve-state)
   ;; Push the key back on the event queue
   (when key3
-    (setq unread-command-events (cons (cons 'no-record key3)
-                                      unread-command-events)))
+    (if (version< emacs-version "26.2")
+        (setq unread-command-events (cons key3
+                                          unread-command-events))
+      (setq unread-command-events (cons (cons 'no-record key3)
+                                        unread-command-events))))
   (when key2
-    (setq unread-command-events (cons (cons 'no-record key2)
-                                      unread-command-events)))
-  (setq unread-command-events (cons (cons 'no-record key)
-                                    unread-command-events)))
+    (if (version< emacs-version "26.2")
+        (setq unread-command-events (cons key2
+                                          unread-command-events))
+      (setq unread-command-events (cons (cons 'no-record key2)
+                                        unread-command-events))))
+  (if (version< emacs-version "26.2")
+      (setq unread-command-events (cons key
+                                        unread-command-events))
+    (setq unread-command-events (cons (cons 'no-record key)
+                                      unread-command-events))))
 
 (defun ergoemacs-kill-line ()
   "Ergoemacs replacement for `kill-line' using `ergoemacs--send-emacs-key'."