[nongnu] elpa/kotlin-mode 043615d3c3 065/162: Merge branch 'master' of https://github.com/purcell/kotlin-mode

[ELPA Syncer]

branch: elpa/kotlin-mode
commit 043615d3c31e0c64928560adf1abf975e9105006
Merge: 0d89426a75 e45a8f73e7
Author: Gregg Hernandez <gregg@lucidchart.com>
Commit: Gregg Hernandez <gregg@lucidchart.com>

    Merge branch 'master' of https://github.com/purcell/kotlin-mode
---
 kotlin-mode.el | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/kotlin-mode.el b/kotlin-mode.el
index 7ccfa4d49c..ac62925bed 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -5,6 +5,7 @@
 
 ;; Author: Shodai Yokoyama (quantumcars@gmail.com)
 ;; Keywords: languages
+;; Package-Requires: ((emacs "24.3"))
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -27,16 +28,6 @@
 
 (require 'rx)
 
-(defcustom kotlin-mode-hook nil
-  "Hook run after entering `kotlin-mode'."
-  :type 'hook
-  :group 'kotlin)
-
-
-(defvar kotlin-mode-map (make-sparse-keymap)
-  "Keymap used by `kotlin-mode'.")
-
-
 (defvar kotlin-mode-syntax-table
   (let ((st (make-syntax-table)))
 
@@ -219,7 +210,7 @@
 (define-derived-mode kotlin-mode prog-mode "Kotlin"
   "Major mode for editing Kotlin."
 
-  (setq-local font-lock-defaults '((kotlin-mode-font-lock-keywords) nil nil))
+  (setq font-lock-defaults '((kotlin-mode-font-lock-keywords) nil nil))
   (setq-local syntax-propertize-function 
#'kotlin-mode--syntax-propertize-function)
   (set (make-local-variable 'comment-start) "//")
   (set (make-local-variable 'comment-padding) 1)