From 2318851238389690498a0ab70eb5285b32604b4f Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Wed, 15 Jul 2015 08:06:25 +0200 Subject: [PATCH] new version of yaml-mode. --- bba.org | 2 +- elpa/yaml-mode-0.0.9/yaml-mode-pkg.el | 1 - .../yaml-mode-autoloads.el | 11 ++------ elpa/yaml-mode-20141125.37/yaml-mode-pkg.el | 1 + .../yaml-mode.el | 26 +++++++++---------- 5 files changed, 16 insertions(+), 25 deletions(-) delete mode 100644 elpa/yaml-mode-0.0.9/yaml-mode-pkg.el rename elpa/{yaml-mode-0.0.9 => yaml-mode-20141125.37}/yaml-mode-autoloads.el (72%) create mode 100644 elpa/yaml-mode-20141125.37/yaml-mode-pkg.el rename elpa/{yaml-mode-0.0.9 => yaml-mode-20141125.37}/yaml-mode.el (96%) diff --git a/bba.org b/bba.org index ad68294b..f948744b 100644 --- a/bba.org +++ b/bba.org @@ -118,7 +118,7 @@ Keep track of your important stuff! ) (progn (add-to-list 'load-path "~/.emacs.d/elpa/magit-20150704.855") - (add-to-list 'load-path "~/.emacs.d/elpa/yaml-mode-0.0.9") + (add-to-list 'load-path "~/.emacs.d/elpa/yaml-mode-20141125.37") (require 'yaml-mode) ) diff --git a/elpa/yaml-mode-0.0.9/yaml-mode-pkg.el b/elpa/yaml-mode-0.0.9/yaml-mode-pkg.el deleted file mode 100644 index b7c8a87e..00000000 --- a/elpa/yaml-mode-0.0.9/yaml-mode-pkg.el +++ /dev/null @@ -1 +0,0 @@ -(define-package "yaml-mode" "0.0.9" "Major mode for editing YAML files" (quote nil)) diff --git a/elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el b/elpa/yaml-mode-20141125.37/yaml-mode-autoloads.el similarity index 72% rename from elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el rename to elpa/yaml-mode-20141125.37/yaml-mode-autoloads.el index 3eacac41..591abc9d 100644 --- a/elpa/yaml-mode-0.0.9/yaml-mode-autoloads.el +++ b/elpa/yaml-mode-20141125.37/yaml-mode-autoloads.el @@ -1,10 +1,9 @@ ;;; yaml-mode-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - +(add-to-list 'load-path (or (file-name-directory #$) (car load-path))) -;;;### (autoloads (yaml-mode yaml) "yaml-mode" "yaml-mode.el" (21205 -;;;;;; 13955)) +;;;### (autoloads nil "yaml-mode" "yaml-mode.el" (21908 14166 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)))) @@ -20,15 +19,9 @@ Simple mode to edit YAML. ;;;*** -;;;### (autoloads nil nil ("yaml-mode-pkg.el") (21205 13955 546345)) - -;;;*** - -(provide 'yaml-mode-autoloads) ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; yaml-mode-autoloads.el ends here diff --git a/elpa/yaml-mode-20141125.37/yaml-mode-pkg.el b/elpa/yaml-mode-20141125.37/yaml-mode-pkg.el new file mode 100644 index 00000000..cb7eaba6 --- /dev/null +++ b/elpa/yaml-mode-20141125.37/yaml-mode-pkg.el @@ -0,0 +1 @@ +(define-package "yaml-mode" "20141125.37" "Major mode for editing YAML files" 'nil :keywords '("data" "yaml")) diff --git a/elpa/yaml-mode-0.0.9/yaml-mode.el b/elpa/yaml-mode-20141125.37/yaml-mode.el similarity index 96% rename from elpa/yaml-mode-0.0.9/yaml-mode.el rename to elpa/yaml-mode-20141125.37/yaml-mode.el index 66ea331e..81cafa44 100644 --- a/elpa/yaml-mode-0.0.9/yaml-mode.el +++ b/elpa/yaml-mode-20141125.37/yaml-mode.el @@ -1,11 +1,12 @@ ;;; yaml-mode.el --- Major mode for editing YAML files -;; Copyright (C) 2010-2013 Yoshiki Kurihara +;; Copyright (C) 2010-2014 Yoshiki Kurihara ;; Author: Yoshiki Kurihara ;; Marshall T. Vandegrift ;; Keywords: data yaml -;; Version: 0.0.9 +;; Package-Version: 20141125.37 +;; Version: 0.0.11 ;; This file is not part of Emacs @@ -115,14 +116,11 @@ that key is pressed to begin a block literal." ;; Constants -(defconst yaml-mode-version "0.0.9" "Version of `yaml-mode'.") +(defconst yaml-mode-version "0.0.11" "Version of `yaml-mode'.") (defconst yaml-blank-line-re "^ *$" "Regexp matching a line containing only (valid) whitespace.") -(defconst yaml-comment-re "\\(?:^\\|\\s-+\\)\\(#.*\\)" - "Regexp matching a line containing a YAML comment or delimiter.") - (defconst yaml-directive-re "^\\(?:--- \\)? *%\\(\\w+\\)" "Regexp matching a line contatining a YAML directive.") @@ -194,8 +192,7 @@ that key is pressed to begin a block literal." (define-key yaml-mode-map ">" 'yaml-electric-bar-and-angle) (define-key yaml-mode-map "-" 'yaml-electric-dash-and-dot) (define-key yaml-mode-map "." 'yaml-electric-dash-and-dot) - (define-key yaml-mode-map [backspace] 'yaml-electric-backspace) - (define-key yaml-mode-map "\C-j" 'newline-and-indent)) + (define-key yaml-mode-map [backspace] 'yaml-electric-backspace)) (defvar yaml-mode-syntax-table nil "Syntax table in use in `yaml-mode' buffers.") @@ -221,6 +218,7 @@ that key is pressed to begin a block literal." "Simple mode to edit YAML. \\{yaml-mode-map}" + :syntax-table yaml-mode-syntax-table (set (make-local-variable 'comment-start) "# ") (set (make-local-variable 'comment-start-skip) "#+ *") (set (make-local-variable 'indent-line-function) 'yaml-indent-line) @@ -228,26 +226,26 @@ that key is pressed to begin a block literal." (set (make-local-variable 'font-lock-defaults) '(yaml-font-lock-keywords nil nil nil nil - (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords)))) + (font-lock-syntactic-keywords . yaml-font-lock-syntactic-keywords))) + (font-lock-fontify-buffer)) ;; Font-lock support (defvar yaml-font-lock-keywords (list - (cons yaml-comment-re '(1 font-lock-comment-face)) (cons yaml-constant-scalars-re '(1 font-lock-constant-face)) (cons yaml-tag-re '(0 font-lock-type-face)) - (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face t)) - (cons yaml-hash-key-re '(1 font-lock-variable-name-face t)) + (cons yaml-node-anchor-alias-re '(0 font-lock-function-name-face)) + (cons yaml-hash-key-re '(1 font-lock-variable-name-face)) (cons yaml-document-delimiter-re '(0 font-lock-comment-face)) (cons yaml-directive-re '(1 font-lock-builtin-face)) - '(yaml-font-lock-block-literals 0 font-lock-string-face t) + '(yaml-font-lock-block-literals 0 font-lock-string-face) '("^[\t]+" 0 'yaml-tab-face t)) "Additional expressions to highlight in YAML mode.") (defvar yaml-font-lock-syntactic-keywords - (list '(yaml-syntactic-block-literals 0 "." t)) + (list '(yaml-syntactic-block-literals 0 ".")) "Additional syntax features to highlight in YAML mode.") -- 2.47.3