[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/lua-mode 3019e75 327/468: Merge pull request #117 from imm
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa/lua-mode 3019e75 327/468: Merge pull request #117 from immerrr/fix-string-parsing |
Date: |
Thu, 5 Aug 2021 04:59:03 -0400 (EDT) |
branch: elpa/lua-mode
commit 3019e7537ba807313f5536b39eb708d949a1cd23
Merge: 563ac50 4b5aad7
Author: dennis again <immerrr@gmail.com>
Commit: dennis again <immerrr@gmail.com>
Merge pull request #117 from immerrr/fix-string-parsing
lua-try-match-multiline-begin: don't do syntax-ppss after the opener
---
lua-mode.el | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/lua-mode.el b/lua-mode.el
index 95bf6dc..1ca228b 100644
--- a/lua-mode.el
+++ b/lua-mode.el
@@ -904,14 +904,12 @@ If none can be found before reaching LIMIT, return nil."
(and (setq last-search-matched
(re-search-forward lua-ml-begin-regexp limit 'noerror))
- ;; (1+ (match-beginning 0)) is required to handle triple-hyphen
- ;; '---[[' situation: regexp matches starting from the second one,
- ;; but it's not yet a comment, because it's a part of 2-character
- ;; comment-start sequence, so if we try to detect if the opener is
- ;; inside a comment from the second hyphen, it'll fail. But the
- ;; third one _is_ inside a comment and considering it instead will
- ;; fix the issue. --immerrr
- (lua-comment-or-string-start-pos (1+ (match-beginning 0)))))
+ (or (lua-comment-or-string-start-pos (match-beginning 0))
+ ;; Handle triple-hyphen '---[[' situation: match-beginning is
+ ;; BEFORE the second hyphen, but the comment would only starts
+ ;; AFTER it.
+ (and (eq ?- (char-after (match-beginning 0)))
+ (eq ?- (char-before (match-beginning 0)))))))
last-search-matched))
- [nongnu] elpa/lua-mode a7780dc 304/468: silence 25.1 byte-compiler, (continued)
- [nongnu] elpa/lua-mode a7780dc 304/468: silence 25.1 byte-compiler, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 37f3c42 306/468: Silence compilation warning about referencing a variable from compile.el, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 148858c 309/468: Migrate tests to buttercup, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 0ce2b96 314/468: Allow to set lua-indent-level as file local variable, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 8b9d895 311/468: Fix comments being spilled into the code (issue #25), Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode cadc1ea 312/468: to-be-fontified-as: improve error messages, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 444ac2f 320/468: Merge 'stable' back into 'master', Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode cae5db6 322/468: Fix derived-mode-p test, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 6511687 323/468: Merge pull request #116 from immerrr/fix-derived-mode-p, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 563ac50 325/468: Merge pull request #115 from RobertCochran/escape-tabs, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 3019e75 327/468: Merge pull request #117 from immerrr/fix-string-parsing,
Philip Kaludercic <=
- [nongnu] elpa/lua-mode a0d6744 331/468: travis.yml: add Emacs-25.1, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode dccda19 336/468: Wrap lua--fill-paragraph in save-excursion, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 7a97e1b 341/468: correct spelling mistake, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 0715340 337/468: Merge pull request #131 from jorams/fill-paragraph-save-excursion, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode d759699 335/468: Merge pull request #129 from immerrr/fix-global-variable-in-lua-interpreter, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 459e3b7 427/468: Fix FIXME: `lua-prefix-key' is always `boundp', Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode b793852 434/468: Add regression test, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 6a30c39 447/468: lua-is-continuing-statement-p: short-circuit to false for "breaker" kws, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode b043ca4 451/468: lua-is-continuing-statement-p-1: fix missing save-excursion on branch, Philip Kaludercic, 2021/08/05
- [nongnu] elpa/lua-mode 6a837f7 458/468: with-lua-buffer: ensure font-lock is activated, Philip Kaludercic, 2021/08/05