summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-sync.el
diff options
context:
space:
mode:
authorKatsumi Yamaoka <yamaoka@jpl.org>2012-07-02 00:48:41 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2012-07-02 00:48:41 +0000
commit6651c01506b4c903a8e473544ee4f7af9c555bca (patch)
tree6d487b5b12c127d3c3ca3df70f802ddd35ed2f4c /lisp/gnus/gnus-sync.el
parent6fe566a75256cd943ad89243021e4e9c041807e2 (diff)
downloademacs-6651c01506b4c903a8e473544ee4f7af9c555bca.tar.gz
emacs-6651c01506b4c903a8e473544ee4f7af9c555bca.tar.bz2
emacs-6651c01506b4c903a8e473544ee4f7af9c555bca.zip
gnus-sync.el: Simply require json
registry.el: Simply require eieio and eieio-base
Diffstat (limited to 'lisp/gnus/gnus-sync.el')
-rw-r--r--lisp/gnus/gnus-sync.el13
1 files changed, 1 insertions, 12 deletions
diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el
index 7e13b885edf..15d94810c3a 100644
--- a/lisp/gnus/gnus-sync.el
+++ b/lisp/gnus/gnus-sync.el
@@ -84,18 +84,7 @@
;;; Code:
(eval-when-compile (require 'cl))
-(eval-and-compile
- (or (ignore-errors (progn
- (require 'json)))
- ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib
- (ignore-errors
- (let ((load-path (cons (expand-file-name
- "gnus-fallback-lib"
- (file-name-directory (locate-library "gnus")))
- load-path)))
- (require 'json)))
- (error
- "json not found in `load-path' or gnus-fallback-lib/ directory.")))
+(require 'json)
(require 'gnus)
(require 'gnus-start)
(require 'gnus-util)