emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/nix-mode 53ea839a52 418/500: Replace javascript-mode with


From: ELPA Syncer
Subject: [nongnu] elpa/nix-mode 53ea839a52 418/500: Replace javascript-mode with js-mode
Date: Sat, 29 Jan 2022 08:27:51 -0500 (EST)

branch: elpa/nix-mode
commit 53ea839a52335d089699d3530bae8ea5914cdbb6
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>

    Replace javascript-mode with js-mode
    
    This is the correct name.
---
 CHANGELOG.md    | 4 ++++
 Cask            | 2 --
 flake.nix       | 1 -
 nix-drv-mode.el | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e77ed9463..bda4dc2512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+* Removed json-mode dependency, using js instead.
+
 ## 1.4.5
 
 * Fixed completion support in nix-repl-mode for Nix 2.
diff --git a/Cask b/Cask
index 31fd291e74..0a1ae1d212 100644
--- a/Cask
+++ b/Cask
@@ -22,5 +22,3 @@
 
 (development
  (depends-on "ert"))
-
-(depends-on "json-mode")
diff --git a/flake.nix b/flake.nix
index f3a0804089..f9c1ef0fee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,6 @@
         emacs = emacsWithPackages (epkgs: with epkgs; [
           org-plus-contrib
           company
-          json-mode
           mmm-mode
         ]);
       in stdenvNoCC.mkDerivation {
diff --git a/nix-drv-mode.el b/nix-drv-mode.el
index c9b253be6b..12223365d8 100644
--- a/nix-drv-mode.el
+++ b/nix-drv-mode.el
@@ -16,7 +16,7 @@
 
 ;;; Code:
 
-(require 'javascript-mode)
+(require 'js)
 (require 'nix)
 
 (defvar-local nix-drv-mode nil)
@@ -40,7 +40,7 @@
                  (format "%s show-derivation \"%s\""
                         nix-executable
                         (buffer-file-name))))
-        (javascript-mode)
+        (js-mode)
         (set-buffer-modified-p nil)
         (read-only-mode 1)))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]