From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/76858 Path: news.gmane.org!not-for-mail From: Raphael Kubo da Costa Newsgroups: gmane.emacs.gnus.general Subject: [PATCH] auth-source.el: Also load EIEIO when byte-compiling. Date: Wed, 16 Feb 2011 23:47:36 -0200 Message-ID: <1297907256-17277-1-git-send-email-kubito@gmail.com> NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1297907309 12481 80.91.229.12 (17 Feb 2011 01:48:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 17 Feb 2011 01:48:29 +0000 (UTC) Cc: tzz@lifelogs.com To: ding@gnus.org Original-X-From: ding-owner+M25197@lists.math.uh.edu Thu Feb 17 02:48:25 2011 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ppsyn-0006oI-8e for ding-account@gmane.org; Thu, 17 Feb 2011 02:48:25 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1PpsyQ-000350-6S; Wed, 16 Feb 2011 19:48:02 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1PpsyN-00034g-2f for ding@lists.math.uh.edu; Wed, 16 Feb 2011 19:47:59 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PpsyL-0003So-7u for ding@lists.math.uh.edu; Wed, 16 Feb 2011 19:47:58 -0600 Original-Received: from mail-yi0-f44.google.com ([209.85.218.44]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1PpsyK-0005qX-BZ for ding@gnus.org; Thu, 17 Feb 2011 02:47:56 +0100 Original-Received: by yie19 with SMTP id 19so962255yie.17 for ; Wed, 16 Feb 2011 17:47:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=5zKxQdvvZzzU5JzoyKHiwouAMHKj3N8q8LH+LGfJUwg=; b=Pm8XgG0NxrZ0MW1dPUTKJ6th3iTIF87jADrEPEfVgtF6PMmXuekFcFXcWyG15Xk3Dc YrD9/t4WMLZrzjjyOwSmFl9odbI6OoBHVvH7BFzqOVKKBIzgJCxI+7H7F+aUbZurxEvC rf2di/sDUCQCl+OrWznjhpb3CPRslNXEUVvhk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=AscC8bYeVryTHc7G/ArcpZG18+1ONLYn7dTrnOkbiU7A0KyhqZ7GbmVSXHeqGw1wLH JXrwfYZ5Zk7u292IlcMo+JOQLZKomrdRI0+ZviV0D8giBpgYL8QF/j2D7Nh5PKhR3rrb T+WaZj7b67RdGXXmnxa/164M2Htz3DltrMGEo= Original-Received: by 10.91.8.20 with SMTP id l20mr1645705agi.147.1297907269684; Wed, 16 Feb 2011 17:47:49 -0800 (PST) Original-Received: from localhost.localdomain ([189.61.209.106]) by mx.google.com with ESMTPS id e24sm446432ana.22.2011.02.16.17.47.47 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Feb 2011 17:47:48 -0800 (PST) X-Mailer: git-send-email 1.7.3.5 X-Spam-Score: -3.0 (---) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:76858 Archived-At: Commit 4a0aa92 moved (require 'eieio) to an `or', and the byte-compiler only loads top-level `require' calls, which resulted in problems when the byte-compiler tried to evaluate the `defclass' macro. The fallback loading code has also been changed -- there was a single condition being checked, and if it evaluated to t the `load' call was always made. --- lisp/ChangeLog | 6 ++++++ lisp/auth-source.el | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 61538e2..3b17570 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-02-16 Raphael Kubo da Costa + + * auth-source.el: Correctly load EIEIO from "gnus-fallback-lib/eieio" + as EIEIO must also be loaded when auth-source.el is being + byte-compiled. + 2011-02-16 Teodor Zlatanov * gnus-fallback-lib/eieio/eieio.el: Copy from Emacs. diff --git a/lisp/auth-source.el b/lisp/auth-source.el index abcc85b..3841e58 100644 --- a/lisp/auth-source.el +++ b/lisp/auth-source.el @@ -44,12 +44,12 @@ (require 'netrc) (require 'assoc) (eval-when-compile (require 'cl)) -(ignore-errors - (or (require 'eieio)) - ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib - (load "gnus-fallback-lib/eieio/eieio")) -(unless (featurep 'eieio) - (error "eieio not found in `load-path' or gnus-fallback-lib/ directory.")) +(eval-and-compile + (or (require 'eieio nil t) + ;; gnus-fallback-lib/ from gnus/lisp/gnus-fallback-lib + (load "gnus-fallback-lib/eieio/eieio")) + (unless (featurep 'eieio) + (error "eieio not found in `load-path' or gnus-fallback-lib/ directory."))) (autoload 'secrets-create-item "secrets") (autoload 'secrets-delete-item "secrets") -- 1.7.3.5