summaryrefslogtreecommitdiff
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorMattias EngdegÄrd <mattiase@acm.org>2024-03-30 15:13:24 +0100
committerMattias EngdegÄrd <mattiase@acm.org>2024-03-30 15:19:56 +0100
commit1135ce461d188869e0294af45641edc2cbfacbf0 (patch)
treefe0c7ec4113ac62c6ab0d28b9bc8bc81dc005906 /lisp/subr.el
parent890edfd2bb8fd79730919972cc82811b73c7f572 (diff)
downloademacs-1135ce461d188869e0294af45641edc2cbfacbf0.tar.gz
Always enable native JSON support and remove Jansson references
* src/json.c (Fjson__available_p): Remove. * lisp/subr.el (json-available-p): Always return t. * admin/nt/dist-build/build-dep-zips.py: * configure.ac: * doc/lispref/text.texi (Parsing JSON): * java/INSTALL: * java/org/gnu/emacs/EmacsNative.java (EmacsNative): * lisp/term/w32-win.el (dynamic-library-alist): * m4/ndk-build.m4 (ndk_INIT): * msdos/sed1v2.inp: * nt/INSTALL: * nt/INSTALL.W64: * src/Makefile.in: * src/emacs.c (main): * src/lisp.h: Remove JSON configuration options and references to it and Jansson from documentation and build files. * etc/NEWS: Announce.
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el5
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index 90dbfc75d52..50487e2c734 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -7346,9 +7346,8 @@ sentence (see Info node `(elisp) Documentation Tips')."
(internal--fill-string-single-line (apply #'format string objects)))
(defun json-available-p ()
- "Return non-nil if Emacs has libjansson support."
- (and (fboundp 'json--available-p)
- (json--available-p)))
+ "Return non-nil if Emacs has native JSON support."
+ t)
(defun ensure-list (object)
"Return OBJECT as a list.