gnus-sync.el: Simply require json

registry.el: Simply require eieio and eieio-base

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 649b5a74fb8e83461f23306960efae429c4b8a1e..d608029e618de424c5fbd3ecac334aa3a4135f54 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-sync.el: Simply require json.
+
+       * registry.el: Simply require eieio and eieio-base.
+
 2012-06-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * tests/gnustest-nntp.el, tests/gnustest-registry.el, tests/: Remove.

diff --git a/lisp/gnus/gnus-sync.el b/lisp/gnus/gnus-sync.el
index 7e13b885edfe29f0cc618ace4c033cc0b4664873..15d94810c3afe93ef915f3814b0900a27e5deec7 100644 (file)
--- 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)

diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index b2130d56eb603de626a947fa17d00d5d7381164f..7b1029a2690242a602274e5be4e408973ade2599 100644 (file)
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -79,20 +79,8 @@
 
 (eval-when-compile (require 'cl))
 
-(eval-and-compile
-  (or (ignore-errors (progn
-                       (require 'eieio)
-                       (require 'eieio-base)))
-      ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib
-      (ignore-errors
-        (let ((load-path (cons (expand-file-name
-                                "gnus-fallback-lib/eieio"
-                                (file-name-directory (locate-library "gnus")))
-                               load-path)))
-          (require 'eieio)
-          (require 'eieio-base)))
-      (error
-       "eieio not found in `load-path' or gnus-fallback-lib/ directory.")))
+(require 'eieio)
+(require 'eieio-base)
 
 (defclass registry-db (eieio-persistent)
   ((version :initarg :version