unofficial mirror of guile-devel@gnu.org 
 help / color / mirror / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: guile-devel@gnu.org
Cc: wingo@igalia.com, "Ludovic Courtès" <ludo@gnu.org>
Subject: [PATCH 2/2] srfi-35: Replace '&error'.
Date: Mon, 25 Nov 2019 17:45:55 +0100	[thread overview]
Message-ID: <20191125164555.15124-3-ludo@gnu.org> (raw)
In-Reply-To: <20191125164555.15124-1-ludo@gnu.org>

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




  parent reply	other threads:[~2019-11-25 16:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-25 16:45 [PATCH 0/2] Silence run-time warnings for SRFI-3[45] Ludovic Courtès
2019-11-25 16:45 ` [PATCH 1/2] srfi-34: Replace the 'raise' core binding Ludovic Courtès
2019-11-26 10:09   ` Andy Wingo
2019-11-26 13:09     ` Ludovic Courtès
2019-11-29 11:00       ` Andy Wingo
2019-11-25 16:45 ` Ludovic Courtès [this message]
2019-11-26 10:10   ` [PATCH 2/2] srfi-35: Replace '&error' Andy Wingo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/guile/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191125164555.15124-3-ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=guile-devel@gnu.org \
    --cc=wingo@igalia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).