From 3fc745d5de3ef7825345132dbcd20784e5cab0e3 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Fri, 6 Feb 2015 14:04:13 +1100 Subject: [PATCH] Fix json error-definition condition build error * lisp/subr.el (define-error): The error conditions may be constant lists, so use `append' to concatenate them. --- lisp/ChangeLog | 5 +++++ lisp/subr.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60746cef3f3..b60e410f96e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2015-02-06 Lars Ingebrigtsen + + * subr.el (define-error): The error conditions may be constant + lists, so use `append' to concatenate them. + 2015-02-06 Wolfgang Jenkner * net/network-stream.el (network-stream-open-tls): Respect the diff --git a/lisp/subr.el b/lisp/subr.el index 68cd230c5e2..3b27b33d960 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -316,7 +316,7 @@ Defaults to `error'." (unless parent (setq parent 'error)) (let ((conditions (if (consp parent) - (apply #'nconc + (apply #'append (mapcar (lambda (parent) (cons parent (or (get parent 'error-conditions) -- 2.39.5