Skip to content

Fix some minor packaging issues #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 17, 2023
Merged

Fix some minor packaging issues #70

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0df861c
Custom group name should not contain the -mode suffix
purcell May 18, 2021
3015fbf
Don't use key sequence reserved for user customisations
purcell May 18, 2021
e6bbab1
font-lock-keywords is always buffer-local
purcell May 18, 2021
9a3570d
Fix package-lint issues
purcell May 22, 2022
6f34dca
More checkdoc fixes
purcell May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions json-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
;;; json-mode.el --- Major mode for editing JSON files.
;;; json-mode.el --- Major mode for editing JSON files

;; Copyright (C) 2011-2014 Josh Johnston

Expand Down Expand Up @@ -30,7 +30,7 @@
(require 'rx)
(require 'json-snatcher)

(defgroup json-mode '()
(defgroup json '()
"Major mode for editing JSON files."
:group 'js)

Expand Down Expand Up @@ -63,16 +63,14 @@ Return the new `auto-mode-alist' entry"
(defvar json-mode--auto-mode-entry)

;;;###autoload
(defcustom json-mode-auto-mode-list '(
".babelrc"
(defcustom json-mode-auto-mode-list '(".babelrc"
".bowerrc"
"composer.lock"
)
"composer.lock")
"List of filenames for the JSON entry of `auto-mode-alist'.

Note however that custom `json-mode' entries in `auto-mode-alist'
won’t be affected."
:group 'json-mode
:group 'json
:type '(repeat string)
:set (lambda (symbol value)
"Update SYMBOL with a new regexp made from VALUE.
Expand Down Expand Up @@ -151,17 +149,18 @@ json font lock syntactic face function."

;;;###autoload
(define-derived-mode json-mode javascript-mode "JSON"
"Major mode for editing JSON files"
"Major mode for editing JSON files."
:syntax-table json-mode-syntax-table
(set (make-local-variable 'font-lock-defaults)
'(json-font-lock-keywords-1
nil nil nil nil
(font-lock-syntactic-face-function . json-mode--syntactic-face))))
(setq font-lock-defaults
'(json-font-lock-keywords-1
nil nil nil nil
(font-lock-syntactic-face-function . json-mode--syntactic-face))))

;;;###autoload
(define-derived-mode jsonc-mode json-mode "JSONC"
"Major mode for editing JSON files with comments"
"Major mode for editing JSON files with comments."
:syntax-table jsonc-mode-syntax-table)
(setq font-lock-defaults '(json-font-lock-keywords-1 t))

;; Well formatted JSON files almost always begin with “{” or “[”.
;;;###autoload
Expand All @@ -179,13 +178,13 @@ json font lock syntactic face function."
(defun json-mode-kill-path ()
"Save JSON path to object at point to kill ring."
(interactive)
(kill-new (jsons-print-path)))
(kill-new (jsons-print-path)))

(define-key json-mode-map (kbd "C-c P") 'json-mode-kill-path)
(define-key json-mode-map (kbd "C-c C-k") 'json-mode-kill-path)

;;;###autoload
(defun json-mode-beautify (begin end)
"Beautify / pretty-print the active region (or the entire buffer if no active region)."
"Beautify/pretty-print from BEGIN to END (or the entire buffer if no active region)."
(interactive "r")
(unless (use-region-p)
(setq begin (point-min)
Expand Down