From 9ecd1be32be9d1b36a54ad06ca331d3d345d983d Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 22 Dec 2024 13:24:21 +0100 Subject: [PATCH] update yaml Signed-off-by: Andreas Gerler --- elpa/yaml-20230714.154/yaml-autoloads.el | 26 --------------- elpa/yaml-20230714.154/yaml-pkg.el | 14 -------- elpa/yaml-20241129.2114/yaml-autoloads.el | 28 ++++++++++++++++ elpa/yaml-20241129.2114/yaml-pkg.el | 10 ++++++ .../yaml.el | 14 ++++---- elpa/yaml-mode-20230714.440/yaml-mode-pkg.el | 15 --------- .../yaml-mode-autoloads.el | 32 +++++++++---------- elpa/yaml-mode-20241003.153/yaml-mode-pkg.el | 11 +++++++ .../yaml-mode.el | 7 ++-- elpa/yaml-mode-readme.txt | 25 --------------- 10 files changed, 77 insertions(+), 105 deletions(-) delete mode 100644 elpa/yaml-20230714.154/yaml-autoloads.el delete mode 100644 elpa/yaml-20230714.154/yaml-pkg.el create mode 100644 elpa/yaml-20241129.2114/yaml-autoloads.el create mode 100644 elpa/yaml-20241129.2114/yaml-pkg.el rename elpa/{yaml-20230714.154 => yaml-20241129.2114}/yaml.el (99%) delete mode 100644 elpa/yaml-mode-20230714.440/yaml-mode-pkg.el rename elpa/{yaml-mode-20230714.440 => yaml-mode-20241003.153}/yaml-mode-autoloads.el (60%) create mode 100644 elpa/yaml-mode-20241003.153/yaml-mode-pkg.el rename elpa/{yaml-mode-20230714.440 => yaml-mode-20241003.153}/yaml-mode.el (98%) delete mode 100644 elpa/yaml-mode-readme.txt diff --git a/elpa/yaml-20230714.154/yaml-autoloads.el b/elpa/yaml-20230714.154/yaml-autoloads.el deleted file mode 100644 index 85ae8588..00000000 --- a/elpa/yaml-20230714.154/yaml-autoloads.el +++ /dev/null @@ -1,26 +0,0 @@ -;;; yaml-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; -;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - - -;;;### (autoloads nil "yaml" "yaml.el" (0 0 0 0)) -;;; Generated autoloads from yaml.el - -(register-definition-prefixes "yaml" '("yaml-")) - -;;;*** - -;;;### (autoloads nil nil ("yaml-pkg.el") (0 0 0 0)) - -;;;*** - -;; Local Variables: -;; version-control: never -;; no-byte-compile: t -;; no-update-autoloads: t -;; coding: utf-8 -;; End: -;;; yaml-autoloads.el ends here diff --git a/elpa/yaml-20230714.154/yaml-pkg.el b/elpa/yaml-20230714.154/yaml-pkg.el deleted file mode 100644 index e6ead0f2..00000000 --- a/elpa/yaml-20230714.154/yaml-pkg.el +++ /dev/null @@ -1,14 +0,0 @@ -(define-package "yaml" "20230714.154" "YAML parser for Elisp" - '((emacs "25.1")) - :commit "ee86566af1ed4975531ab3aa4eb4dba770c227f6" :authors - '(("Zachary Romero" . "zkry@posteo.org")) - :maintainers - '(("Zachary Romero" . "zkry@posteo.org")) - :maintainer - '("Zachary Romero" . "zkry@posteo.org") - :keywords - '("tools") - :url "https://github.com/zkry/yaml.el") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/yaml-20241129.2114/yaml-autoloads.el b/elpa/yaml-20241129.2114/yaml-autoloads.el new file mode 100644 index 00000000..5dfa6517 --- /dev/null +++ b/elpa/yaml-20241129.2114/yaml-autoloads.el @@ -0,0 +1,28 @@ +;;; yaml-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + +;;; Code: + +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + + + +;;; Generated autoloads from yaml.el + +(register-definition-prefixes "yaml" '("yaml-")) + +;;; End of scraped data + +(provide 'yaml-autoloads) + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; no-native-compile: t +;; coding: utf-8-emacs-unix +;; End: + +;;; yaml-autoloads.el ends here diff --git a/elpa/yaml-20241129.2114/yaml-pkg.el b/elpa/yaml-20241129.2114/yaml-pkg.el new file mode 100644 index 00000000..94eec439 --- /dev/null +++ b/elpa/yaml-20241129.2114/yaml-pkg.el @@ -0,0 +1,10 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "yaml" "20241129.2114" + "YAML parser for Elisp." + '((emacs "25.1")) + :url "https://github.com/zkry/yaml.el" + :commit "cd3edfc02cb12514426c00e07160b87bd8340f4a" + :revdesc "cd3edfc02cb1" + :keywords '("tools") + :authors '(("Zachary Romero" . "zkry@posteo.org")) + :maintainers '(("Zachary Romero" . "zkry@posteo.org"))) diff --git a/elpa/yaml-20230714.154/yaml.el b/elpa/yaml-20241129.2114/yaml.el similarity index 99% rename from elpa/yaml-20230714.154/yaml.el rename to elpa/yaml-20241129.2114/yaml.el index 6c61ffcd..66836a33 100644 --- a/elpa/yaml-20230714.154/yaml.el +++ b/elpa/yaml-20241129.2114/yaml.el @@ -1,17 +1,16 @@ ;;; yaml.el --- YAML parser for Elisp -*- lexical-binding: t -*- -;; Copyright © 2021 Zachary Romero +;; Copyright © 2021-2024 Free Software Foundation, Inc. ;; Author: Zachary Romero -;; Version: 0.5.1 +;; Package-Version: 20241129.2114 +;; Package-Revision: cd3edfc02cb1 ;; Homepage: https://github.com/zkry/yaml.el ;; Package-Requires: ((emacs "25.1")) ;; Keywords: tools ;; yaml.el requires at least GNU Emacs 25.1 -;; This file is not part of GNU Emacs - ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 3, or (at your option) @@ -305,9 +304,9 @@ This flag is intended for development purposes.") ((string-match "^[-+]?[0-9]+$" scalar) (string-to-number scalar)) ((string-match "^0o[0-7]+$" scalar) - (string-to-number scalar 8)) + (string-to-number (substring scalar 2) 8)) ((string-match "^0x[0-9a-fA-F]+$" scalar) - (string-to-number scalar 16)) + (string-to-number (substring scalar 2) 16)) ;; tag:yaml.org,2002:float ((string-match "^[-+]?\\(\\.[0-9]+\\|[0-9]+\\(\\.[0-9]*\\)?\\)\\([eE][-+]?[0-9]+\\)?$" @@ -2765,6 +2764,9 @@ Rules for this function are defined by the yaml-spec JSON file." "Encode OBJECT to a YAML string." (with-temp-buffer (yaml--encode-object object 0) + (goto-char (point-min)) + (while (looking-at-p "\n") + (delete-char 1)) (buffer-string))) (defun yaml--encode-object (object indent &optional auto-indent) diff --git a/elpa/yaml-mode-20230714.440/yaml-mode-pkg.el b/elpa/yaml-mode-20230714.440/yaml-mode-pkg.el deleted file mode 100644 index c2eff04e..00000000 --- a/elpa/yaml-mode-20230714.440/yaml-mode-pkg.el +++ /dev/null @@ -1,15 +0,0 @@ -(define-package "yaml-mode" "20230714.440" "Major mode for editing YAML files" - '((emacs "24.1")) - :commit "13728b4b1b1bd33d3a754236a0f23e4c76d6ba91" :authors - '(("Yoshiki Kurihara" . "clouder@gmail.com") - ("Marshall T. Vandegrift" . "llasram@gmail.com")) - :maintainers - '(("Vasilij Schneidermann" . "mail@vasilij.de")) - :maintainer - '("Vasilij Schneidermann" . "mail@vasilij.de") - :keywords - '("data" "yaml") - :url "https://github.com/yoshiki/yaml-mode") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/yaml-mode-20230714.440/yaml-mode-autoloads.el b/elpa/yaml-mode-20241003.153/yaml-mode-autoloads.el similarity index 60% rename from elpa/yaml-mode-20230714.440/yaml-mode-autoloads.el rename to elpa/yaml-mode-20241003.153/yaml-mode-autoloads.el index ac6dee22..953e1f9b 100644 --- a/elpa/yaml-mode-20230714.440/yaml-mode-autoloads.el +++ b/elpa/yaml-mode-20241003.153/yaml-mode-autoloads.el @@ -1,39 +1,37 @@ -;;; yaml-mode-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; yaml-mode-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (0 0 0 0)) ;;; Generated autoloads from yaml-mode.el -(let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads)))) - +(let ((loads (get 'yaml 'custom-loads))) (if (member '"yaml-mode" loads) nil (put 'yaml 'custom-loads (cons '"yaml-mode" loads)) (put 'languages 'custom-loads (cons 'yaml (get 'languages 'custom-loads))))) (autoload 'yaml-mode "yaml-mode" "\ Simple mode to edit YAML. \\{yaml-mode-map} -\(fn)" t nil) - +(fn)" t) (add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode)) - (add-to-list 'magic-mode-alist '("^%YAML\\s-+[0-9]+\\.[0-9]+\\(\\s-+#\\|\\s-*$\\)" . yaml-mode)) - (register-definition-prefixes "yaml-mode" '("yaml-")) - -;;;*** -;;;### (autoloads nil nil ("yaml-mode-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'yaml-mode-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; yaml-mode-autoloads.el ends here diff --git a/elpa/yaml-mode-20241003.153/yaml-mode-pkg.el b/elpa/yaml-mode-20241003.153/yaml-mode-pkg.el new file mode 100644 index 00000000..3c3a53a7 --- /dev/null +++ b/elpa/yaml-mode-20241003.153/yaml-mode-pkg.el @@ -0,0 +1,11 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "yaml-mode" "20241003.153" + "Major mode for editing YAML files." + '((emacs "24.1")) + :url "https://github.com/yoshiki/yaml-mode" + :commit "d91f878729312a6beed77e6637c60497c5786efa" + :revdesc "d91f87872931" + :keywords '("data" "yaml") + :authors '(("Yoshiki Kurihara" . "clouder@gmail.com") + ("Marshall T. Vandegrift" . "llasram@gmail.com")) + :maintainers '(("Vasilij Schneidermann" . "mail@vasilij.de"))) diff --git a/elpa/yaml-mode-20230714.440/yaml-mode.el b/elpa/yaml-mode-20241003.153/yaml-mode.el similarity index 98% rename from elpa/yaml-mode-20230714.440/yaml-mode.el rename to elpa/yaml-mode-20241003.153/yaml-mode.el index d3c1da8e..721a49f9 100644 --- a/elpa/yaml-mode-20230714.440/yaml-mode.el +++ b/elpa/yaml-mode-20241003.153/yaml-mode.el @@ -8,7 +8,8 @@ ;; URL: https://github.com/yoshiki/yaml-mode ;; Package-Requires: ((emacs "24.1")) ;; Keywords: data yaml -;; Version: 0.0.15 +;; Package-Version: 20241003.153 +;; Package-Revision: d91f87872931 ;; This file is not part of Emacs @@ -103,7 +104,7 @@ that key is pressed to begin a block literal." (defface yaml-tab-face '((((class color)) (:background "red" :foreground "red" :bold t)) - (t (:reverse-video t))) + (t (:inverse-video t))) "Face to use for highlighting tabs in YAML files." :group 'faces :group 'yaml) @@ -222,9 +223,11 @@ that key is pressed to begin a block literal." :syntax-table yaml-mode-syntax-table (set (make-local-variable 'comment-start) "# ") (set (make-local-variable 'comment-start-skip) "#+ *") + (set (make-local-variable 'comment-end) "") (set (make-local-variable 'indent-line-function) 'yaml-indent-line) (set (make-local-variable 'indent-tabs-mode) nil) (set (make-local-variable 'fill-paragraph-function) 'yaml-fill-paragraph) + (set (make-local-variable 'page-delimiter) "^---\\([ \t].*\\)*\n") (set (make-local-variable 'syntax-propertize-function) 'yaml-mode-syntax-propertize-function) diff --git a/elpa/yaml-mode-readme.txt b/elpa/yaml-mode-readme.txt deleted file mode 100644 index 7afdf205..00000000 --- a/elpa/yaml-mode-readme.txt +++ /dev/null @@ -1,25 +0,0 @@ -This is a major mode for editing files in the YAML data -serialization format. It was initially developed by Yoshiki -Kurihara and many features were added by Marshall Vandegrift. As -YAML and Python share the fact that indentation determines -structure, this mode provides indentation and indentation command -behavior very similar to that of python-mode. - -Installation: - -To install, just drop this file into a directory in your -`load-path' and (optionally) byte-compile it. To automatically -handle files ending in '.yml', add something like: - - (require 'yaml-mode) - (add-to-list 'auto-mode-alist '("\\.yml\\'" . yaml-mode)) - -to your .emacs file. - -Unlike python-mode, this mode follows the Emacs convention of not -binding the ENTER key to `newline-and-indent'. To get this -behavior, add the key definition to `yaml-mode-hook': - - (add-hook 'yaml-mode-hook - '(lambda () - (define-key yaml-mode-map "\C-m" 'newline-and-indent))) -- 2.47.3