[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/yaml-mode 41adb32 112/124: Merge pull request #77 from dgu
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/yaml-mode 41adb32 112/124: Merge pull request #77 from dgutov/single-quote-fixup |
Date: |
Sun, 29 Aug 2021 11:36:24 -0400 (EDT) |
branch: elpa/yaml-mode
commit 41adb32b886352827c4d4b4ad15cdf18a00c8c50
Merge: 9e8362d ed7ec2e
Author: Vasilij Schneidermann <mail@vasilij.de>
Commit: GitHub <noreply@github.com>
Merge pull request #77 from dgutov/single-quote-fixup
Don't freeze on unclosed strings
---
test-files/test-quotes-in-strings.yaml | 1 +
yaml-mode.el | 5 ++++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/test-files/test-quotes-in-strings.yaml
b/test-files/test-quotes-in-strings.yaml
index 5859bbd..07137a9 100644
--- a/test-files/test-quotes-in-strings.yaml
+++ b/test-files/test-quotes-in-strings.yaml
@@ -3,3 +3,4 @@ some's'strings'some's'nots:
- this: 'is a string with "quotes"'
- and: 'to express one single quote, use '' two of them'
- finally: syntax is not string
+- singlequotedoesntfreeze: '
diff --git a/yaml-mode.el b/yaml-mode.el
index 66e41b3..6bd4000 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -284,7 +284,10 @@ that key is pressed to begin a block literal."
;; We're right after a quote that opens a string literal.
;; Skip over it (big speedup for long JSON strings).
(goto-char (1- pt))
- (ignore-errors (forward-sexp)))))))))
+ (condition-case nil
+ (forward-sexp)
+ (scan-error
+ (goto-char end))))))))))
(defun yaml-font-lock-block-literals (bound)
"Find lines within block literals.
- [nongnu] elpa/yaml-mode 8105718 105/124: Simplify the implementation; move a comment, (continued)
- [nongnu] elpa/yaml-mode 8105718 105/124: Simplify the implementation; move a comment, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode add6156 113/124: yaml-mode-syntax-propertize-function: Clear ppss cache, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode bce5aa1 011/124: changed version and added Changes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 9d5a888 025/124: Merge pull request #6 from gvalkov/yaml-file-type, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode a87ab36 046/124: add RECRUITMENTS, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode dcdcd81 049/124: Add myself as maintainer, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6ddd552 058/124: Merge pull request #34 from antalk2/again-p2, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 75c8f36 064/124: Unhighlight foo#bar tokens, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 1cff904 067/124: fix regex in adding yaml-mode to auto-mode-alist, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 3fc5a33 094/124: Mark block literals to unfontify quotes in them, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 41adb32 112/124: Merge pull request #77 from dgutov/single-quote-fixup,
ELPA Syncer <=
- [nongnu] elpa/yaml-mode fea2fb0 114/124: Mention the bug report, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 97a58b3 109/124: Make sure not to pre-fill ppss cache with wrong entries, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 68fecb5 118/124: Exclude newline from `yaml-nested-map-re`, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e142e65 008/124: added newline, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode f68472b 024/124: automatically enable yaml-mode for *.yaml files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode cf171f4 026/124: `checkdoc' nits (including the `checkdoc-autoload' extension)., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e2befd8 027/124: Merge pull request #7 from SamB/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 6d40a1d 033/124: resolved conflict, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode d1b8be6 039/124: Merge pull request #23 from Wilfred/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 11df403 044/124: Merge pull request #30 from rhoml/enable-eyaml, ELPA Syncer, 2021/08/29