From: Glenn Morris <rgm@gnu.org>
Date: Fri, 22 Feb 2008 03:56:25 +0000 (+0000)
Subject: (top-level): No need to require thingatpt.
X-Git-Tag: emacs-pretest-23.0.90~7758
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f62e3e0a291a6d95ff65b15451d04bcc1457a22d;p=emacs.git

(top-level): No need to require thingatpt.
(json-read-keyword): Use thing-at-point rather than word-at-point.
---

diff --git a/lisp/json.el b/lisp/json.el
index 787ea0eb7ce..64d6f03a780 100644
--- a/lisp/json.el
+++ b/lisp/json.el
@@ -53,7 +53,6 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(require 'thingatpt)
 
 ;; Compatibility code
 
@@ -200,14 +199,14 @@ KEYWORD is the keyword expected."
             (signal 'json-unknown-keyword
                     (list (save-excursion
                             (backward-word 1)
-                            (word-at-point)))))
+                            (thing-at-point 'word)))))
           (json-advance))
         keyword)
   (unless (looking-at "\\(\\s-\\|[],}]\\|$\\)")
     (signal 'json-unknown-keyword
             (list (save-excursion
                     (backward-word 1)
-                    (word-at-point)))))
+                    (thing-at-point 'word)))))
   (cond ((string-equal keyword "true") t)
         ((string-equal keyword "false") json-false)
         ((string-equal keyword "null") json-null)))