branch: elpa/scala-mode
commit 37e7537e9c9a1a1bdfd4cd1058491559a6ed0c69
Author: Sam Halliday <sam.halli...@gmail.com>
Commit: Sam Halliday <sam.halli...@gmail.com>
rename to scala-mode (#110)
---
.gitignore | 2 +-
Cask | 2 +-
scala-mode2-fontlock.el => scala-mode-fontlock.el | 4 ++--
scala-mode2-imenu.el => scala-mode-imenu.el | 6 +++---
scala-mode2-indent.el => scala-mode-indent.el | 10 +++++-----
scala-mode2-lib.el => scala-mode-lib.el | 2 +-
scala-mode2-map.el => scala-mode-map.el | 4 ++--
...a-mode2-paragraph.el => scala-mode-paragraph.el | 2 +-
...fy-symbols.el => scala-mode-prettify-symbols.el | 6 +++---
scala-mode2-syntax.el => scala-mode-syntax.el | 2 +-
scala-mode2.el => scala-mode.el | 23 +++++++++++-----------
scala-mode2-pkg.el | 1 -
scala-mode2-sbt.el | 10 ----------
13 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7a0f02f..ed55a4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
*.elc
.cask
-
+*-pkg.el
diff --git a/Cask b/Cask
index 286746e..23b58eb 100644
--- a/Cask
+++ b/Cask
@@ -24,7 +24,7 @@
(source melpa-stable)
-(package-file "scala-mode2.el")
+(package-file "scala-mode.el")
(development
(depends-on "ert-runner")
diff --git a/scala-mode2-fontlock.el b/scala-mode-fontlock.el
similarity index 99%
rename from scala-mode2-fontlock.el
rename to scala-mode-fontlock.el
index 07e3858..7c0aa7d 100644
--- a/scala-mode2-fontlock.el
+++ b/scala-mode-fontlock.el
@@ -2,7 +2,7 @@
;;; Copyright (c) 2012 Heikki Vesalainen
;;; For information on the License, see the LICENSE file
-(require 'scala-mode2-syntax)
+(require 'scala-mode-syntax)
(defcustom scala-font-lock:constant-list '()
"A list of strigs that should be fontified in constant
@@ -579,4 +579,4 @@ Does not continue past limit.
(defvar scala-font-lock:var-keyword-face 'scala-font-lock:var-keyword-face
"Face for the scala var keyword.")
-(provide 'scala-mode2-fontlock)
+(provide 'scala-mode-fontlock)
diff --git a/scala-mode2-imenu.el b/scala-mode-imenu.el
similarity index 98%
rename from scala-mode2-imenu.el
rename to scala-mode-imenu.el
index 9bc9c77..0edc134 100644
--- a/scala-mode2-imenu.el
+++ b/scala-mode-imenu.el
@@ -4,7 +4,7 @@
;;; Code:
-(require 'scala-mode2-syntax)
+(require 'scala-mode-syntax)
;; Make lambdas proper clousures (only in this file)
(make-local-variable 'lexical-binding)
@@ -123,5 +123,5 @@
`(,member-name ,definition-type ,(point-marker)))))
-(provide 'scala-mode2-imenu)
-;;; scala-mode2-imenu.el ends here
+(provide 'scala-mode-imenu)
+;;; scala-mode-imenu.el ends here
diff --git a/scala-mode2-indent.el b/scala-mode-indent.el
similarity index 99%
rename from scala-mode2-indent.el
rename to scala-mode-indent.el
index b8a1c7f..d7269b8 100644
--- a/scala-mode2-indent.el
+++ b/scala-mode-indent.el
@@ -2,8 +2,8 @@
;;; Copyright (c) 2012 Heikki Vesalainen
;;; For information on the License, see the LICENSE file
-(require 'scala-mode2-syntax)
-(require 'scala-mode2-lib)
+(require 'scala-mode-syntax)
+(require 'scala-mode-lib)
(eval-when-compile
(defvar scala-indent:effective-run-on-strategy)
@@ -918,7 +918,7 @@ of a line inside a multi-line comment "
(defun scala-indent:fixup-whitespace ()
- "scala-mode2 version of `fixup-whitespace'"
+ "scala-mode version of `fixup-whitespace'"
(interactive "*")
(save-excursion
(delete-horizontal-space)
@@ -932,7 +932,7 @@ of a line inside a multi-line comment "
(insert ?\s))))
(defun scala-indent:join-line (&optional arg)
- "scala-mode2 version of `join-line', i.e. `delete-indentation'"
+ "scala-mode version of `join-line', i.e. `delete-indentation'"
(interactive "*P")
(beginning-of-line)
(if arg (forward-line 1))
@@ -951,4 +951,4 @@ of a line inside a multi-line comment "
(delete-forward-char 3))))
(scala-indent:fixup-whitespace)))
-(provide 'scala-mode2-indent)
+(provide 'scala-mode-indent)
diff --git a/scala-mode2-lib.el b/scala-mode-lib.el
similarity index 96%
rename from scala-mode2-lib.el
rename to scala-mode-lib.el
index ef3ae8c..538f3a0 100644
--- a/scala-mode2-lib.el
+++ b/scala-mode-lib.el
@@ -23,4 +23,4 @@
(unless (bolp)
(delete-char (- (line-end-position) (point))))))
-(provide 'scala-mode2-lib)
+(provide 'scala-mode-lib)
diff --git a/scala-mode2-map.el b/scala-mode-map.el
similarity index 93%
rename from scala-mode2-map.el
rename to scala-mode-map.el
index e6cfc5c..08e5991 100644
--- a/scala-mode2-map.el
+++ b/scala-mode-map.el
@@ -2,7 +2,7 @@
;;; Copyright (c) 2012 Heikki Vesalainen
;;; For information on the License, see the LICENSE file
-(require 'scala-mode2-indent)
+(require 'scala-mode-indent)
(defvar scala-mode-map
(let ((map (make-sparse-keymap)))
@@ -23,4 +23,4 @@
(add-hook 'post-command-hook
'scala-indent:remove-indent-from-previous-empty-line))
-(provide 'scala-mode2-map)
+(provide 'scala-mode-map)
diff --git a/scala-mode2-paragraph.el b/scala-mode-paragraph.el
similarity index 99%
rename from scala-mode2-paragraph.el
rename to scala-mode-paragraph.el
index 42f764d..73e4ec3 100644
--- a/scala-mode2-paragraph.el
+++ b/scala-mode-paragraph.el
@@ -118,4 +118,4 @@
;; the rest should not be filled (code, etc)
(t t))))
-(provide 'scala-mode2-paragraph)
+(provide 'scala-mode-paragraph)
diff --git a/scala-mode2-prettify-symbols.el b/scala-mode-prettify-symbols.el
similarity index 90%
rename from scala-mode2-prettify-symbols.el
rename to scala-mode-prettify-symbols.el
index ca43431..03ee4c6 100644
--- a/scala-mode2-prettify-symbols.el
+++ b/scala-mode-prettify-symbols.el
@@ -1,4 +1,4 @@
-;;; scala-mode2-prettify-symbols.el --- Prettifying scala symbols -*- coding:
utf-8; -*-
+;;; scala-mode-prettify-symbols.el --- Prettifying scala symbols -*- coding:
utf-8; -*-
;; Copyright (c) 2016 Merlin Göttlinger
;; License: http://www.gnu.org/licenses/gpl.html
@@ -79,5 +79,5 @@
:type 'alist
:group 'scala)
-(provide 'scala-mode2-prettify-symbols)
-;;; scala-mode2-prettify-symbols.el ends here
+(provide 'scala-mode-prettify-symbols)
+;;; scala-mode-prettify-symbols.el ends here
diff --git a/scala-mode2-syntax.el b/scala-mode-syntax.el
similarity index 99%
rename from scala-mode2-syntax.el
rename to scala-mode-syntax.el
index 401f529..6eb9312 100644
--- a/scala-mode2-syntax.el
+++ b/scala-mode-syntax.el
@@ -992,4 +992,4 @@ val a, b = (1, 2)
(defun scala-syntax:go-to-pos (pos) (when pos (goto-char pos)))
-(provide 'scala-mode2-syntax)
+(provide 'scala-mode-syntax)
diff --git a/scala-mode2.el b/scala-mode.el
similarity index 94%
rename from scala-mode2.el
rename to scala-mode.el
index a0158c0..ba912b8 100644
--- a/scala-mode2.el
+++ b/scala-mode.el
@@ -1,4 +1,4 @@
-;;; scala-mode2.el --- Major mode for editing Scala
+;;; scala-mode.el --- Major mode for editing Scala
;; Copyright (c) 2012 Heikki Vesalainen
@@ -13,15 +13,14 @@
;;
;;; Code:
-(require 'scala-mode2-lib)
-(require 'scala-mode2-syntax)
-(require 'scala-mode2-paragraph)
-(require 'scala-mode2-indent)
-(require 'scala-mode2-fontlock)
-(require 'scala-mode2-map)
-(require 'scala-mode2-sbt)
-(require 'scala-mode2-imenu)
-(require 'scala-mode2-prettify-symbols)
+(require 'scala-mode-lib)
+(require 'scala-mode-syntax)
+(require 'scala-mode-paragraph)
+(require 'scala-mode-indent)
+(require 'scala-mode-fontlock)
+(require 'scala-mode-map)
+(require 'scala-mode-imenu)
+(require 'scala-mode-prettify-symbols)
;; Tested only for emacs 24
(unless (<= 24 emacs-major-version)
@@ -178,5 +177,5 @@ When started, runs `scala-mode-hook'.
'("\\.\\(scala\\|sbt\\)\\'" . scala-mode))
(modify-coding-system-alist 'file "\\.\\(scala\\|sbt\\)\\'" 'utf-8))
-(provide 'scala-mode2)
-;;; scala-mode2.el ends here
+(provide 'scala-mode)
+;;; scala-mode.el ends here
diff --git a/scala-mode2-pkg.el b/scala-mode2-pkg.el
deleted file mode 100644
index 88027b1..0000000
--- a/scala-mode2-pkg.el
+++ /dev/null
@@ -1 +0,0 @@
-(define-package "scala-mode2" "0.22" "Major mode for editing Scala" 'nil)
diff --git a/scala-mode2-sbt.el b/scala-mode2-sbt.el
deleted file mode 100644
index 3ef5e33..0000000
--- a/scala-mode2-sbt.el
+++ /dev/null
@@ -1,10 +0,0 @@
-;;; scala-mode-lib.el - Major mode for editing scala, common functions
-;;; Copyright (c) 2012 Heikki Vesalainen
-;;; For information on the License, see the LICENSE file
-
-(require 'comint)
-
-(define-obsolete-function-alias 'scala-sbt:start 'sbt-start "2013-11-16"
"scala-sbt:start has been obsoleted. Please use the sbt-start from the sbt-mode
package directly")
-(define-obsolete-function-alias 'scala-sbt:command 'sbt-command "2013-11-16"
"scala-sbt:command has been obsolted. Please use the sbt-command from the
sbt-mode package directly")
-
-(provide 'scala-mode2-sbt)
