From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Newsgroups: gmane.lisp.guile.devel Subject: [PATCH 2/2] srfi-35: Replace '&error'. Date: Mon, 25 Nov 2019 17:45:55 +0100 Message-ID: <20191125164555.15124-3-ludo@gnu.org> References: <20191125164555.15124-1-ludo@gnu.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="218951"; mail-complaints-to="usenet@blaine.gmane.org" Cc: wingo@igalia.com, =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Mon Nov 25 17:47:26 2019 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iZHWI-000up9-Fn for guile-devel@m.gmane.org; Mon, 25 Nov 2019 17:47:26 +0100 Original-Received: from localhost ([::1]:46482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZHWG-0006Zx-SA for guile-devel@m.gmane.org; Mon, 25 Nov 2019 11:47:25 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49658) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZHV8-00064z-TE for guile-devel@gnu.org; Mon, 25 Nov 2019 11:46:15 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:39372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZHV8-0001K9-Pe; Mon, 25 Nov 2019 11:46:14 -0500 Original-Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=49658 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iZHV8-0008Gm-9a; Mon, 25 Nov 2019 11:46:14 -0500 X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191125164555.15124-1-ludo@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: "guile-devel" Xref: news.gmane.org gmane.lisp.guile.devel:20166 Archived-At: This ensures core binding '&error' is silently replaced by the SRFI-35 variant. * module/srfi/srfi-35.scm (srfi:&error): New variable. Use it to #:replace '&error'. --- module/srfi/srfi-35.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/srfi/srfi-35.scm b/module/srfi/srfi-35.scm index d1549f9d4..efa1566bf 100644 --- a/module/srfi/srfi-35.scm +++ b/module/srfi/srfi-35.scm @@ -1,6 +1,6 @@ ;;; srfi-35.scm --- Conditions -*- coding: utf-8 -*- -;; Copyright (C) 2007-2011, 2017 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011, 2017, 2019 Free Software Foundation, Inc. ;; ;; This library is free software; you can redistribute it and/or ;; modify it under the terms of the GNU Lesser General Public @@ -39,8 +39,8 @@ (exception-message . condition-message) (&error . &serious) (error? . serious-condition?) - (&external-error . &error) (external-error? . error?)) + #:replace ((srfi:&error . &error)) #:export (make-condition define-condition-type condition-has-type? @@ -139,3 +139,5 @@ by C." ((_ (type field ...) ...) (make-compound-condition (condition-instantiation type () field ...) ...)))) + +(define srfi:&error &external-error) -- 2.24.0