[elpa] externals/ergoemacs-mode da06d4f 112/325: Fix more warnings. Remove compatibility with <25.1.

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit da06d4f268fc3d65333915c55c8403f4338cfcb1
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Fix more warnings.  Remove compatibility with <25.1.
---
 ergoemacs-macros.el | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 3d320ba..421ad2a 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -667,17 +667,11 @@ When arg1 can be a property.  The following properties 
are supported:
         (arg4 (nth 3 args)))
     (cond
      ((and arg1 (symbolp arg1) (eq arg1 :reset-prefix))
-      (if (>= 25 emacs-major-version)
-         `(prefix-command-preserve-state)
-       `(reset-this-command-lengths)))
+      `(prefix-command-preserve-state))
      ((and arg1 (symbolp arg1) (eq arg1 :set-selection))
-      (if (>= 25 emacs-major-version)
-          `(gui-set-selection ,@(cdr args))
-        `(x-set-selection ,@(cdr args))))
+      `(gui-set-selection ,@(cdr args)))
      ((and arg1 (symbolp arg1) (eq arg1 :set-selection))
-      (if (>= 25 emacs-major-version)
-         `(gui-set-selection ,@(cdr args))
-       `(x-set-selection ,@(cdr args))))
+      `(gui-set-selection ,@(cdr args)))
      ((and arg1 (symbolp arg1) (eq arg1 :custom-p) (symbolp arg2))
       (if (fboundp 'custom-variable-p)
           `(custom-variable-p ,arg2)