[nongnu] elpa/scala-mode f9a380a0d0 5/5: Merge pull request #190 from hvesalai/fix-emacs-version

[ELPA Syncer]

branch: elpa/scala-mode
commit f9a380a0d095b7383cc28f6636d81c9a27f00f6b
Merge: 8c22458075 df60066e31
Author: Heikki Vesalainen <heikkivesalainen@yahoo.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #190 from hvesalai/fix-emacs-version
    
    Require version 25.1
---
 scala-mode.el     | 10 +++++-----
 scala-organise.el |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scala-mode.el b/scala-mode.el
index ddabd3ae8f..fe144626de 100644
--- a/scala-mode.el
+++ b/scala-mode.el
@@ -4,8 +4,8 @@
 
 ;; Homepage: https://github.com/hvesalai/emacs-scala-mode
 ;; Keywords: languages
-;; Package-Version:  1.1.0
-;; Package-Requires: ((emacs "24.2"))
+;; Package-Version:  1.1.1
+;; Package-Requires: ((emacs "25.1"))
 
 ;;; Commentary:
 ;;
@@ -23,10 +23,10 @@
 (defvar fixup-whitespace) ;; for compilation
 (defvar delete-indentation) ;; for compilation
 
-;; Tested only for emacs 24
-(unless (<= 24 emacs-major-version)
+;; Tested only for emacs 25
+(unless (<= 25 emacs-major-version)
   (error
-   (format "The Scala mode has been tested only on Emacs version 24.2 (and not 
your Emacs version %s.%s)"
+   (format "The Scala mode has been tested only on Emacs version 25.1 (and not 
your Emacs version %s.%s)"
            emacs-major-version  emacs-minor-version)))
 
 (defgroup scala nil
diff --git a/scala-organise.el b/scala-organise.el
index 38d9b08af2..31da9fef7e 100644
--- a/scala-organise.el
+++ b/scala-organise.el
@@ -83,7 +83,7 @@ entries."
                       (cons "_" (seq-filter (lambda (e) (string-match-p (rx 
"=>") e)) parts))
                     parts))
          (clean (lambda (s) (replace-regexp-in-string (rx (* space) "=>" (* 
space)) " => " s)))
-         (rendered (if (and (length= parts_ 1)
+         (rendered (if (and (= (length parts_) 1)
                             (not (string-match-p (rx "=>") (car parts_))) )
                        (car parts_)
                      (concat "{ " (mapconcat clean parts_ ", ") " }"))))