From 961d0965c6358a41a9ddd727032c5102068dc40b Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Thu, 31 Oct 2019 17:17:38 +0100 Subject: [PATCH] update json-mode --- bba.org | 1 + .../json-mode-autoloads.el | 13 +++++-------- .../json-mode-pkg.el | 2 +- .../json-mode.el | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) rename elpa/{json-mode-20180718.809 => json-mode-20190123.422}/json-mode-autoloads.el (86%) rename elpa/{json-mode-20180718.809 => json-mode-20190123.422}/json-mode-pkg.el (59%) rename elpa/{json-mode-20180718.809 => json-mode-20190123.422}/json-mode.el (98%) diff --git a/bba.org b/bba.org index cb4d1e19..4d38e15e 100644 --- a/bba.org +++ b/bba.org @@ -4402,6 +4402,7 @@ Check a AWS Cloudformation template with [[https://github.com/stelligent/cfn_nag "Check buffer with cfn_nag_scan." (interactive) (shell-command (concat "cfn_nag_scan --input-path " buffer-file-name))) + (require 'json-mode) (define-key json-mode-map (kbd "C-c C-n") 'bba-aws-cfn-nag-scan) #+END_SRC diff --git a/elpa/json-mode-20180718.809/json-mode-autoloads.el b/elpa/json-mode-20190123.422/json-mode-autoloads.el similarity index 86% rename from elpa/json-mode-20180718.809/json-mode-autoloads.el rename to elpa/json-mode-20190123.422/json-mode-autoloads.el index 272b3e1a..76ee6a81 100644 --- a/elpa/json-mode-20180718.809/json-mode-autoloads.el +++ b/elpa/json-mode-20190123.422/json-mode-autoloads.el @@ -1,12 +1,10 @@ ;;; json-mode-autoloads.el --- automatically extracted autoloads ;; ;;; Code: - -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) - +(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path)))) -;;;### (autoloads nil "json-mode" "json-mode.el" (0 0 0 0)) +;;;### (autoloads nil "json-mode" "json-mode.el" (23994 42598 229743 +;;;;;; 114000)) ;;; Generated autoloads from json-mode.el (defconst json-mode-standard-file-ext '(".json" ".jsonld") "\ @@ -35,6 +33,8 @@ Major mode for editing JSON files \(fn)" t nil) +(add-to-list 'magic-fallback-mode-alist '("^[{[]$" . json-mode)) + (autoload 'json-mode-show-path "json-mode" "\ Print the path to the node at point to the minibuffer, and yank to the kill ring. @@ -50,14 +50,11 @@ Beautify / pretty-print the active region (or the entire buffer if no active reg \(fn)" t nil) -(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "json-mode" '("json-"))) - ;;;*** ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 ;; End: ;;; json-mode-autoloads.el ends here diff --git a/elpa/json-mode-20180718.809/json-mode-pkg.el b/elpa/json-mode-20190123.422/json-mode-pkg.el similarity index 59% rename from elpa/json-mode-20180718.809/json-mode-pkg.el rename to elpa/json-mode-20190123.422/json-mode-pkg.el index 4b7a5b5c..5dab6796 100644 --- a/elpa/json-mode-20180718.809/json-mode-pkg.el +++ b/elpa/json-mode-20190123.422/json-mode-pkg.el @@ -1,2 +1,2 @@ ;;; -*- no-byte-compile: t -*- -(define-package "json-mode" "20180718.809" "Major mode for editing JSON files." '((json-reformat "0.0.5") (json-snatcher "1.0.0")) :commit "ffc92b1eefc54963703b43be140f4c8c8ad348f7" :authors '(("Josh Johnston")) :maintainer '("Josh Johnston") :url "https://github.com/joshwnj/json-mode") +(define-package "json-mode" "20190123.422" "Major mode for editing JSON files." '((json-reformat "0.0.5") (json-snatcher "1.0.0")) :commit "0e819e519ae17a2686e0881c4ca51fa873fa9b83" :authors '(("Josh Johnston")) :maintainer '("Josh Johnston") :url "https://github.com/joshwnj/json-mode") diff --git a/elpa/json-mode-20180718.809/json-mode.el b/elpa/json-mode-20190123.422/json-mode.el similarity index 98% rename from elpa/json-mode-20180718.809/json-mode.el rename to elpa/json-mode-20190123.422/json-mode.el index 0c600a3e..cbc2d51f 100644 --- a/elpa/json-mode-20180718.809/json-mode.el +++ b/elpa/json-mode-20190123.422/json-mode.el @@ -4,7 +4,7 @@ ;; Author: Josh Johnston ;; URL: https://github.com/joshwnj/json-mode -;; Package-Version: 20180718.809 +;; Package-Version: 20190123.422 ;; Version: 1.6.0 ;; Package-Requires: ((json-reformat "0.0.5") (json-snatcher "1.0.0")) @@ -122,7 +122,8 @@ This function calls `json-mode--update-auto-mode' to change the (set (make-local-variable 'font-lock-defaults) '(json-font-lock-keywords-1 t))) ;; Well formatted JSON files almost always begin with “{” or “[”. -(add-to-list 'magic-mode-alist '("^[{[]$" . json-mode)) +;;;###autoload +(add-to-list 'magic-fallback-mode-alist '("^[{[]$" . json-mode)) ;;;###autoload (defun json-mode-show-path () -- 2.47.3