branch: elpa/scala-mode commit 711091af19cd00c5f1ba942a6e0bb3aa188a224e Author: Heikki Vesalainen <heikkivesalai...@yahoo.com> Commit: Heikki Vesalainen <heikkivesalai...@yahoo.com>
moved provides to end of files --- scala-mode2-fontlock.el | 5 +++-- scala-mode2-indent.el | 4 ++-- scala-mode2-lib.el | 4 ++-- scala-mode2-map.el | 3 +-- scala-mode2-paragraph.el | 4 ++-- scala-mode2-syntax.el | 4 ++-- scala-mode2.el | 3 +-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/scala-mode2-fontlock.el b/scala-mode2-fontlock.el index f7cda0e..05f574b 100644 --- a/scala-mode2-fontlock.el +++ b/scala-mode2-fontlock.el @@ -2,8 +2,6 @@ ;;; Copyright (c) 2012 Heikki Vesalainen ;;; For information on the License, see the LICENSE file -(provide 'scala-mode2-fontlock) - (require 'scala-mode2-syntax) (defcustom scala-font-lock:constant-list '() @@ -499,3 +497,6 @@ Does not continue past limit. (defvar scala-font-lock:var-face 'scala-font-lock:var-face "Face for scala variable names.") + + +(provide 'scala-mode2-fontlock) diff --git a/scala-mode2-indent.el b/scala-mode2-indent.el index fafc079..3ba69b9 100644 --- a/scala-mode2-indent.el +++ b/scala-mode2-indent.el @@ -2,8 +2,6 @@ ;;; Copyright (c) 2012 Heikki Vesalainen ;;; For information on the License, see the LICENSE file -(provide 'scala-mode2-indent) - (require 'scala-mode2-syntax) (require 'scala-mode2-lib) @@ -901,3 +899,5 @@ of a line inside a multi-line comment " (defun scala-mode:indent-scaladoc-asterisk (&optional insert-space-p) (message "scala-mode:indent-scaladoc-asterisk has been deprecated")) + +(provide 'scala-mode2-indent) diff --git a/scala-mode2-lib.el b/scala-mode2-lib.el index 1628280..ef3ae8c 100644 --- a/scala-mode2-lib.el +++ b/scala-mode2-lib.el @@ -2,8 +2,6 @@ ;;; Copyright (c) 2012 Heikki Vesalainen ;;; For information on the License, see the LICENSE file -(provide 'scala-mode2-lib) - (defvar scala-mode:debug-messages "If true, some debug messages may be printed printed." nil) @@ -24,3 +22,5 @@ (skip-syntax-backward " ") (unless (bolp) (delete-char (- (line-end-position) (point)))))) + +(provide 'scala-mode2-lib) diff --git a/scala-mode2-map.el b/scala-mode2-map.el index a7d4149..8870730 100644 --- a/scala-mode2-map.el +++ b/scala-mode2-map.el @@ -2,8 +2,6 @@ ;;; Copyright (c) 2012 Heikki Vesalainen ;;; For information on the License, see the LICENSE file -(provide 'scala-mode2-map) - (require 'scala-mode2-indent) (defmacro scala-mode-map:define-keys (key-map key-funcs) @@ -36,3 +34,4 @@ )) (setq scala-mode-map keymap))) +(provide 'scala-mode2-map) diff --git a/scala-mode2-paragraph.el b/scala-mode2-paragraph.el index 060dcf9..42f764d 100644 --- a/scala-mode2-paragraph.el +++ b/scala-mode2-paragraph.el @@ -8,8 +8,6 @@ ;;; Provides paragraph navigation and fill for scaladocs and ;;; multi-line strings. -(provide 'scala-mode2-paragraph) - (defconst scala-paragraph:paragraph-line-start-re (concat "\\(?:\\s *" ; whitespace "\\(?://+\\|\\*\\|/\\*+" ; comment start @@ -119,3 +117,5 @@ ;; TODO: fill lists ;; the rest should not be filled (code, etc) (t t)))) + +(provide 'scala-mode2-paragraph) diff --git a/scala-mode2-syntax.el b/scala-mode2-syntax.el index 8a93206..0ffe960 100644 --- a/scala-mode2-syntax.el +++ b/scala-mode2-syntax.el @@ -4,8 +4,6 @@ ;;; Based on Scala Language Specification (SLS) Version 2.9 -(provide 'scala-mode2-syntax) - ;;;; ;;;; Scala syntax regular expressions ;;;; @@ -806,3 +804,5 @@ not. A list must be either enclosed in parentheses or start with (scala-syntax:backward-sexp))) (when (looking-at scala-syntax:list-keywords-re) (goto-char (match-end 0)))))))) + +(provide 'scala-mode2-syntax) diff --git a/scala-mode2.el b/scala-mode2.el index b85795a..a444ad0 100644 --- a/scala-mode2.el +++ b/scala-mode2.el @@ -5,8 +5,6 @@ ;; URL: http://github.com/hvesalai/scala-mode2 ;; Based on Scala Language Specification (SLS) Version 2.9 -(provide 'scala-mode2) - (require 'scala-mode2-lib) (require 'scala-mode2-syntax) (require 'scala-mode2-paragraph) @@ -109,4 +107,5 @@ When started, runs `scala-mode-hook'. (add-to-list 'auto-mode-alist '("\\.scala\\'" . scala-mode)) (modify-coding-system-alist 'file "\\.scala\\'" 'utf-8) +(provide 'scala-mode2) ;;; scala-mode2.el ends here