Merge branch 'master' into feature/igcfeature/igc

1 files changed, 5 insertions, 6 deletions

diff --git a/lisp/json.el b/lisp/json.el
index f2086474a8b..82cc9c71bf5 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -609,12 +609,11 @@ transforms an unsortable MAP into a sortable alist."
   "Insert a JSON representation of ALIST at point.
 Sort ALIST first if `json-encoding-object-sort-predicate' is
 non-nil.  Sorting can optionally be DESTRUCTIVE for speed."
-  (json--print-map (if (and json-encoding-object-sort-predicate alist)
-                       (sort (if destructive alist (copy-sequence alist))
-                             (lambda (a b)
-                               (funcall json-encoding-object-sort-predicate
-                                        (car a) (car b))))
-                     alist)))
+  (json--print-map (let ((pred json-encoding-object-sort-predicate))
+                     (if (and pred alist)
+                         (sort alist :key #'car :lessp pred
+                               :in-place destructive)
+                       alist))))
 
 ;; The following two are unused but useful to keep around due to the
 ;; inherent ambiguity of lists.