[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/yaml 7f055d207c 057/124: Merge pull request #17 from co
From: |
ELPA Syncer |
Subject: |
[elpa] externals/yaml 7f055d207c 057/124: Merge pull request #17 from conao3/plist-keyword |
Date: |
Fri, 29 Nov 2024 16:00:00 -0500 (EST) |
branch: externals/yaml
commit 7f055d207c69bd4a418cfc6691ca005ff85188f4
Merge: 2aa5a6faf7 8903b6c7e4
Author: Zachary Romero <zacromero@posteo.net>
Commit: GitHub <noreply@github.com>
Merge pull request #17 from conao3/plist-keyword
Return plist key as a keyword
---
yaml.el | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/yaml.el b/yaml.el
index 6f2f583b7f..55dcef819e 100644
--- a/yaml.el
+++ b/yaml.el
@@ -413,9 +413,12 @@ This flag is intended for development purposes.")
(progn
(let ((key (pop yaml--cache))
(table (car yaml--object-stack)))
- (when (and (eql 'symbol yaml--parsing-object-key-type)
- (stringp key))
- (setq key (intern key)))
+ (when (stringp key)
+ (cond
+ ((eql 'symbol yaml--parsing-object-key-type)
+ (setq key (intern key)))
+ ((eql 'keyword yaml--parsing-object-key-type)
+ (setq key (intern (format ":%s" key))))))
(puthash key value table))
(pop yaml--state-stack)))
((equal top-state :trail-comments)
@@ -967,10 +970,14 @@ value. It defaults to the symbol :false."
(cond
((or (not object-key-type)
(equal 'string object-key-type))
- (setq yaml--parsing-object-key-type 'string))
+ (if (equal 'plist yaml--parsing-object-type)
+ (setq yaml--parsing-object-key-type 'keyword)
+ (setq yaml--parsing-object-key-type 'string)))
((equal 'symbol object-key-type)
(setq yaml--parsing-object-key-type 'symbol))
- (t (error "Invalid object-key-type. object-key-type must be string, or
symbol")))
+ ((equal 'keyword object-key-type)
+ (setq yaml--parsing-object-key-type 'keyword))
+ (t (error "Invalid object-key-type. object-key-type must be string,
keyword, or symbol")))
(cond
((or (not sequence-type)
(equal sequence-type 'array))
- [elpa] externals/yaml 7f09102db0 115/124: Remove leading new-lines for yaml-encode, (continued)
- [elpa] externals/yaml 7f09102db0 115/124: Remove leading new-lines for yaml-encode, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 276596561a 032/124: Fix explicit document end on ns-plain, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml c215bf7a33 083/124: add function for generating parse with metadata strings, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml f374a7f17e 013/124: indentation indicator bug fix, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml d8ac09e8ca 053/124: Merge pull request #11 from zkry/fix-encoding-nil-false-arrays, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml bdfaa8ce55 101/124: Merge pull request #40 from zkry/fix-block-indent-detection, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 69654c291f 090/124: Fix string values state bug, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 01ab8d1910 078/124: Merge pull request #30 from zkry/29-fix-list-encoding-indentation, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 9382bf5a3b 070/124: Merge pull request #25 from zkry/fix-lines-longer-than-80, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 34c300b085 075/124: Merge pull request #28 from tarsiiformes/nil, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 7f055d207c 057/124: Merge pull request #17 from conao3/plist-keyword,
ELPA Syncer <=
- [elpa] externals/yaml b0d95e7e81 066/124: Use `alist-get` to converting alist to hash table, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml c3988d10e2 098/124: store current indent level and use that for basis of block indent, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 94ea32ecb7 103/124: version bump, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml ee34639c96 105/124: Update docstring and README to match current behavior, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 12655d58ef 113/124: Fix typos, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml b72c188381 111/124: Fix character escape code, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 20202d7c39 123/124: Merge pull request #56 from zkry/fix-octal-hex-parsing, ELPA Syncer, 2024/11/29
- [elpa] externals/yaml 3506009f94 031/124: Fix yaml-process-literal-text-test, ELPA Syncer, 2024/11/29