From 09b0e594bcd48f8b1918bd848bddb3332832bcf7 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett@blangdon.com>
Date: Sun, 25 Aug 2013 08:26:44 -0400
Subject: [PATCH] add json-mode

---
 emacs                                         |   4 ++
 .../json-mode-0.1.2/json-mode-autoloads.el    |  29 ++++++++++++
 emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.el |   1 +
 .../elpa/json-mode-0.1.2/json-mode-pkg.elc    | Bin 0 -> 632 bytes
 emacs.d/elpa/json-mode-0.1.2/json-mode.el     |  44 ++++++++++++++++++
 emacs.d/elpa/json-mode-0.1.2/json-mode.elc    | Bin 0 -> 3843 bytes
 6 files changed, 78 insertions(+)
 create mode 100644 emacs.d/elpa/json-mode-0.1.2/json-mode-autoloads.el
 create mode 100644 emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.el
 create mode 100644 emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.elc
 create mode 100644 emacs.d/elpa/json-mode-0.1.2/json-mode.el
 create mode 100644 emacs.d/elpa/json-mode-0.1.2/json-mode.elc

diff --git a/emacs b/emacs
index daceb98..fcf4c23 100644
--- a/emacs
+++ b/emacs
@@ -52,6 +52,10 @@
 	  '(lambda ()
 	     (add-hook 'before-save-hook 'gofmt)))
 
+;js-mode overwrites json-mode when loading .json files, so this is
+; to force json-mode for .json files
+(add-to-list 'auto-mode-alist '("\\.json$" . json-mode))
+
 ;solarize ALL the things
 (color-theme-initialize)
 (color-theme-clarity)
diff --git a/emacs.d/elpa/json-mode-0.1.2/json-mode-autoloads.el b/emacs.d/elpa/json-mode-0.1.2/json-mode-autoloads.el
new file mode 100644
index 0000000..f04c8a9
--- /dev/null
+++ b/emacs.d/elpa/json-mode-0.1.2/json-mode-autoloads.el
@@ -0,0 +1,29 @@
+;;; json-mode-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+
+;;;### (autoloads (json-mode) "json-mode" "json-mode.el" (21017 62178
+;;;;;;  0 0))
+;;; Generated autoloads from json-mode.el
+
+(autoload 'json-mode "json-mode" "\
+Major mode for editing JSON files
+
+\(fn)" t nil)
+
+;;;***
+
+;;;### (autoloads nil nil ("json-mode-pkg.el") (21017 62178 965022
+;;;;;;  0))
+
+;;;***
+
+(provide 'json-mode-autoloads)
+;; 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/emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.el b/emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.el
new file mode 100644
index 0000000..c5e500b
--- /dev/null
+++ b/emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.el
@@ -0,0 +1 @@
+(define-package "json-mode" "0.1.2" "Major mode for editing JSON files" (quote nil))
diff --git a/emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.elc b/emacs.d/elpa/json-mode-0.1.2/json-mode-pkg.elc
new file mode 100644
index 0000000000000000000000000000000000000000..3e29f56bce8f6030bd169c98a25cb056be111a3d
GIT binary patch
literal 632
zcmbtRO>e?54CUNEu&dS6CeaiMNPJudhy&BuCb9hhlcXh(##NGTV!wWAnGn;C_>wrb
z-+S?!t)7>6olYm3&1SHqvQk<K*qvZ!rS}?5A;>%~n#3g=<O`x>@@9!?;;4ZPY-<Da
zx`1p1z45d+oQ{T&_4<PrF}GAg9xx&OaMHT;8a8FJMDCbKrLHhNI5J5|LMA=dXW3O=
z9SbIP3#bgNnj!cMXe!WWLpEUjw)Um`9#98Wl~<+uMjsj+i`wG*Ub(Z9+DQlEWUy2m
z1aarBGKK4gs&yVvh_HbRPk+L)$v+H10mG07PR3(su6>@2!;4Ag+vR!<e2*5n4<frQ
zJsJUyfTMw(1Wovd<o7cUBwDSc1-}oC+2G6@thp%~0k=jJMfXDH%E+Wbe#AmTd@(GB
ixV0>t8$6JO#zn}(MGED^a^Y$F`qFOS#bA_vh<*SEW4?R<

literal 0
HcmV?d00001

diff --git a/emacs.d/elpa/json-mode-0.1.2/json-mode.el b/emacs.d/elpa/json-mode-0.1.2/json-mode.el
new file mode 100644
index 0000000..f0a991d
--- /dev/null
+++ b/emacs.d/elpa/json-mode-0.1.2/json-mode.el
@@ -0,0 +1,44 @@
+;;; json-mode.el --- Major mode for editing JSON files
+;;; Author: Josh Johnston
+;;; URL: https://github.com/joshwnj/json-mode
+;;; Version: 0.1.2
+
+;;;;
+;; extend javascript-mode's syntax highlighting
+
+(defvar json-mode-hook nil)
+
+(defconst json-quoted-key-re "\\(\"[^\"]+?\"[ ]*:\\)")
+(defconst json-quoted-string-re "\\(\".*?\"\\)") 
+(defconst json-number-re "[^\"]\\([0-9]+\\(\\.[0-9]+\\)?\\)[^\"]")
+(defconst json-keyword-re "\\(true\\|false\\|null\\)")
+
+(defconst json-font-lock-keywords-1
+  (list 
+   (list json-quoted-key-re 1 font-lock-keyword-face)
+   (list json-quoted-string-re 1 font-lock-string-face)
+   (list json-keyword-re 1 font-lock-constant-face)
+   (list json-number-re 1 font-lock-constant-face)
+   )
+  "Level one font lock.")
+
+(defun beautify-json ()
+  (interactive)
+  (let ((b (if mark-active (min (point) (mark)) (point-min)))
+        (e (if mark-active (max (point) (mark)) (point-max))))
+    ;; Beautify json with support for non-ascii characters.
+    ;; Thanks to https://github.com/jarl-dk for this improvement.
+    (shell-command-on-region b e
+     "python -c 'import sys,json; data=json.loads(sys.stdin.read()); print json.dumps(data,sort_keys=True,indent=4).decode(\"unicode_escape\").encode(\"utf8\",\"replace\")'" (current-buffer) t)))
+
+;;;###autoload
+(define-derived-mode json-mode javascript-mode "JSON"
+  "Major mode for editing JSON files"
+  (set (make-local-variable 'font-lock-defaults) '(json-font-lock-keywords-1 t)))
+
+(add-to-list 'auto-mode-alist '("\\.json$" . json-mode))
+
+(define-key json-mode-map (kbd "C-c C-f") 'beautify-json)
+
+(provide 'json-mode)
+;;; json-mode.el ends here
diff --git a/emacs.d/elpa/json-mode-0.1.2/json-mode.elc b/emacs.d/elpa/json-mode-0.1.2/json-mode.elc
new file mode 100644
index 0000000000000000000000000000000000000000..a7ba3a263c85b19f0c306f78724e3063c6b49e32
GIT binary patch
literal 3843
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
RDNy@30Ro*I*r!3i`zIV6%oYFu

literal 0
HcmV?d00001