[Emacs-diffs] /srv/bzr/emacs/trunk r108826: gnus-sync.el: Simply require json

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 108826
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-02 00:48:41 +0000
message:
  gnus-sync.el: Simply require json
  registry.el: Simply require eieio and eieio-base
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-sync.el
  lisp/gnus/registry.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-06-29 04:15:43 +0000
+++ b/lisp/gnus/ChangeLog       2012-07-02 00:48:41 +0000
@@ -1,3 +1,9 @@
+2012-07-02  Katsumi Yamaoka  <address@hidden>
+
+       * gnus-sync.el: Simply require json.
+
+       * registry.el: Simply require eieio and eieio-base.
+
 2012-06-29  Katsumi Yamaoka  <address@hidden>
 
        * tests/gnustest-nntp.el, tests/gnustest-registry.el, tests/: Remove.

=== modified file 'lisp/gnus/gnus-sync.el'
--- a/lisp/gnus/gnus-sync.el    2012-06-26 22:52:31 +0000
+++ b/lisp/gnus/gnus-sync.el    2012-07-02 00:48:41 +0000
@@ -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)

=== modified file 'lisp/gnus/registry.el'
--- a/lisp/gnus/registry.el     2012-06-26 22:52:31 +0000
+++ b/lisp/gnus/registry.el     2012-07-02 00:48:41 +0000
@@ -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