[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/julia-mode 4f72dfa 246/352: Merge pull request #13 from Ju
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/julia-mode 4f72dfa 246/352: Merge pull request #13 from JuliaLang/keywords_in_comments |
Date: |
Sun, 29 Aug 2021 11:22:54 -0400 (EDT) |
branch: elpa/julia-mode
commit 4f72dfa5af900212299133170ddefb45ebfafef4
Merge: e4b3428 8818ede
Author: Yichao Yu <yyc1992@gmail.com>
Commit: Yichao Yu <yyc1992@gmail.com>
Merge pull request #13 from JuliaLang/keywords_in_comments
fix ignoring of keywords inside comments
---
julia-mode-tests.el | 8 ++++++++
julia-mode.el | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/julia-mode-tests.el b/julia-mode-tests.el
index bd57f17..647323b 100644
--- a/julia-mode-tests.el
+++ b/julia-mode-tests.el
@@ -284,6 +284,14 @@ end"
end
end"))
+(ert-deftest julia--test-indent-after-commented-keyword ()
+ "Ignore keywords in comments when indenting."
+ (julia--should-indent
+ "# if foo
+a = 1"
+ "# if foo
+a = 1"))
+
(defun julia--run-tests ()
(interactive)
(if (featurep 'ert)
diff --git a/julia-mode.el b/julia-mode.el
index 4e41075..e9a2c0c 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -408,8 +408,8 @@ a keyword if used as a field name, X.word, or quoted,
:word."
(member (current-word t) kw-list)
;; 'end' is not a keyword when used for indexing, e.g. foo[end-2]
(or (not (equal (current-word t) "end"))
- (not (julia-in-brackets))
- (not (julia-in-comment)))))
+ (not (julia-in-brackets)))
+ (not (julia-in-comment))))
;; if backward-sexp gives an error, move back 1 char to move over the '('
(defun julia-safe-backward-sexp ()
- [nongnu] elpa/julia-mode 0f064b7 280/352: Enable color in inferior julia, (continued)
- [nongnu] elpa/julia-mode 0f064b7 280/352: Enable color in inferior julia, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode ec01995 285/352: Merge pull request #54 from jamii/patch-1, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 68181e6 293/352: Replace IntSet by BitSet, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode cb6d4bd 267/352: Fix badge URL, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 6a0f756 288/352: Merge pull request #67 from tpapp/tp/latexsubs, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 0d9a793 287/352: Move LaTeX substitutions to a separate file, clean up generating script., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode deda1e2 284/352: Add test, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 69439e2 055/352: Fix Stephan's last name in .mailmap., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 5762e13 133/352: remove * and div for Char, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 40c5e82 185/352: Fix indentation when we're indenting a line that has an open paren after point., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 4f72dfa 246/352: Merge pull request #13 from JuliaLang/keywords_in_comments,
ELPA Syncer <=
- [nongnu] elpa/julia-mode 344e6c2 283/352: Merge pull request #42 from antoine-levitt/math-insert, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 115d4dc 277/352: Regenerate latex auto completion (#45), ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode db84928 299/352: Merge pull request #74 from non-Jedi/emoji, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode d21b83d 316/352: Merge pull request #93 from non-Jedi/julia-mode-latexsubs_feature, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 839726a 336/352: Merge pull request #123 from ronisbr/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 2395931 142/352: Since julia-mode.el contains utf-8 chars, mark the file as utf-8., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 5e52d81 188/352: Don't error if the first line of the file is empty., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode b66f8a4 274/352: Insertion of math symbols in julia using auctex's mechanism, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 864e124 311/352: remove newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 686bed3 309/352: remove unused lexical args that gave a warning, ELPA Syncer, 2021/08/29