[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/yaml-mode 3362e1b 057/124: Merge pull request #33 from ant
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/yaml-mode 3362e1b 057/124: Merge pull request #33 from antalk2/antalk2-patch-1 |
Date: |
Sun, 29 Aug 2021 11:36:12 -0400 (EDT) |
branch: elpa/yaml-mode
commit 3362e1be9df87b1cf13a0fc40e53f511ebab9add
Merge: dcdcd81 bdc47a4
Author: Vasilij Schneidermann <v.schneidermann@gmail.com>
Commit: Vasilij Schneidermann <v.schneidermann@gmail.com>
Merge pull request #33 from antalk2/antalk2-patch-1
allow spaces before '-' in yaml-scalar-context-re
---
test-files/allow-spaces-before-dash-1.yaml | 18 ++++++++++++++++++
test-files/allow-spaces-before-dash-2.yaml | 7 +++++++
test-files/allow-spaces-before-dash-3.yaml | 7 +++++++
yaml-mode.el | 2 +-
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/test-files/allow-spaces-before-dash-1.yaml
b/test-files/allow-spaces-before-dash-1.yaml
new file mode 100644
index 0000000..c46f823
--- /dev/null
+++ b/test-files/allow-spaces-before-dash-1.yaml
@@ -0,0 +1,18 @@
+
+## Old behaviour (v0.0.12)
+##
+## (1) open this file
+##
+## (2) move to the line containing l1
+##
+## (3) Press TAB. First character of l1 should now be below '|', but
+## it is below the dash
+##
+## New behaviour:
+##
+## (1) When l1 is unindented, pressing TAB indents it to start below '|'
+##
+##
+- bb:
+ - |
+l1
diff --git a/test-files/allow-spaces-before-dash-2.yaml
b/test-files/allow-spaces-before-dash-2.yaml
new file mode 100644
index 0000000..3fa43f4
--- /dev/null
+++ b/test-files/allow-spaces-before-dash-2.yaml
@@ -0,0 +1,7 @@
+# For comparison: this is handled correctly in v0.0.12
+#
+# (1) Move to line containing l3
+# (2) TAB indents l3 by 2 spaces to start below '|'
+#
+- |
+l3
diff --git a/test-files/allow-spaces-before-dash-3.yaml
b/test-files/allow-spaces-before-dash-3.yaml
new file mode 100644
index 0000000..4703b9b
--- /dev/null
+++ b/test-files/allow-spaces-before-dash-3.yaml
@@ -0,0 +1,7 @@
+# For comparison: this is handled correctly in v0.0.12
+#
+# (1) Move to line containing l4
+# (2) Pressing TAB indents l4 by 2 spaces to starts below ':'
+#
+xy: |
+l4
diff --git a/yaml-mode.el b/yaml-mode.el
index e40a3bd..3e67139 100644
--- a/yaml-mode.el
+++ b/yaml-mode.el
@@ -146,7 +146,7 @@ that key is pressed to begin a block literal."
"Regexp matching a single YAML hash key.")
(defconst yaml-scalar-context-re
- (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *"
+ (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?: *[-,] +\\)+\\) *"
"\\(?:" yaml-bare-scalar-re " *: \\)?")
"Regexp indicating the begininng of a scalar context.")
- [nongnu] elpa/yaml-mode 4ce371e 013/124: Removed version from README., (continued)
- [nongnu] elpa/yaml-mode 4ce371e 013/124: Removed version from README., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 1fa61ec 016/124: Fixed bug for tabified indent., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode b751113 021/124: Merge pull request #5 from sugyan/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode c2ac933 023/124: changed version, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode b15a8ff 028/124: fix anchor name can contain '_', ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 67b8355 042/124: Merge pull request #21 from wentasah/fill-paragraph, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 2941501 043/124: Merge pull request #29 from tarsius/font-lock-ensure, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode eb46305 052/124: rename test-file, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode a96d09d 054/124: Description of behaviour updated., ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 73951dd 055/124: added test files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 3362e1b 057/124: Merge pull request #33 from antalk2/antalk2-patch-1,
ELPA Syncer <=
- [nongnu] elpa/yaml-mode 4966854 061/124: Merge pull request #36 from mmckinst/license, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode e73adce 069/124: Fix regex in autoload as well, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode c0d6da0 073/124: Merge pull request #42 from scop/spelling, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode b03fba2 074/124: Merge pull request #43 from scop/raml, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 93252a0 076/124: Change dashes from word to symbol syntax, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 64b2891 083/124: Merge pull request #47 from Wilfred/references_as_punctuation, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 700dfda 093/124: Use block literal font-lock first, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 5b4a0db 098/124: Bump version, summarize changes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode ad8685c 104/124: yaml-mode-syntax-propertize-function: Speed up in large strings, ELPA Syncer, 2021/08/29
- [nongnu] elpa/yaml-mode 0b33131 115/124: Merge pull request #78 from dgutov/spf-correctness, ELPA Syncer, 2021/08/29