[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/kotlin-mode c40557c411 053/162: Merge pull request #1 from
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/kotlin-mode c40557c411 053/162: Merge pull request #1 from gergoerdi/master |
Date: |
Sat, 29 Jan 2022 08:25:22 -0500 (EST) |
branch: elpa/kotlin-mode
commit c40557c4111286b5124af6e99cc09145de23ef57
Merge: 9762ca895d 1624e7d795
Author: Remy Goldschmidt <taktoa@gmail.com>
Commit: Remy Goldschmidt <taktoa@gmail.com>
Merge pull request #1 from gergoerdi/master
Comment support, 'nested' and 'inner' class modifiers
---
kotlin-mode.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kotlin-mode.el b/kotlin-mode.el
index d9d6fc7ae5..8fcff59046 100644
--- a/kotlin-mode.el
+++ b/kotlin-mode.el
@@ -59,7 +59,7 @@
'("package" "import"))
(defconst kotlin-mode--type-decl-keywords
- '("data" "class" "trait" "typealias" "enum"))
+ '("nested" "inner" "data" "class" "trait" "typealias" "enum"))
(defconst kotlin-mode--fun-decl-keywords
'("fun"))
@@ -220,6 +220,10 @@
(setq-local 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)
+ (set (make-local-variable 'comment-start-skip) "\\(//+\\|/\\*+\\)\\s *")
+ (set (make-local-variable 'comment-end) "")
:group 'kotlin
:syntax-table kotlin-mode-syntax-table)
- [nongnu] elpa/kotlin-mode 565a266142 063/162: Add kt to auto-mode-alist to trigger kotlin-mode, (continued)
- [nongnu] elpa/kotlin-mode 565a266142 063/162: Add kt to auto-mode-alist to trigger kotlin-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 043615d3c3 065/162: Merge branch 'master' of https://github.com/purcell/kotlin-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode b4ec722a4c 071/162: lexical-binding setting must be at first line, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode ed5bb641a9 073/162: makes tab-width configurable, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 52c8099b45 078/162: Merge pull request #1 from taktoa/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode afbf3ae8fe 081/162: Merge branch 'master' of https://github.com/gregghz/kotlin-mode into gregghz-master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode cd4901acc6 080/162: Merge pull request #6 from jasonm23/patch-1, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode f54da34b3f 088/162: Merge pull request #11 from russel/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode c051947e27 041/162: kotlin-mode: Highlight string interpolations, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode a659099864 037/162: kotlin-mode: Add kotlin-mode--syntax-propertize-interpolation, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode c40557c411 053/162: Merge pull request #1 from gergoerdi/master,
ELPA Syncer <=
- [nongnu] elpa/kotlin-mode 2f3d991159 060/162: Remove redundant declaration of hook and keymap, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 953bb91328 151/162: Merge pull request #50 from taku0/fix-comment-at-bob, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode ab61099682 152/162: use 4 for defualt tab width, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode e5c6d845e6 093/162: Merge pull request #19 from gregghz/fixes-closing-bracket-indentation, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 72a2bf2347 096/162: Add a file to get Travis-CI to run the test suite., ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode b91bab57b6 099/162: Adding REPL support, credit to https://github.com/sarvex/kotlin-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 1ed0c5589e 098/162: Merge pull request #22 from russel/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 8574583b30 105/162: Fix highlighting escaped identifiers in interpolations, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode eb3704e0e2 106/162: Set adaptive-fill-regexp to comment-start-skip, ELPA Syncer, 2022/01/29
- [nongnu] elpa/kotlin-mode 77d709ab54 107/162: Merge pull request #30 from CyberShadow/pull-20180624-142858, ELPA Syncer, 2022/01/29