From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Fri, 6 Feb 2015 03:04:13 +0000 (+1100)
Subject: Fix json error-definition condition build error
X-Git-Tag: emacs-25.0.90~2008^2~87
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3fc745d5de3ef7825345132dbcd20784e5cab0e3;p=emacs.git

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.
---

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  <larsi@gnus.org>
+
+	* subr.el (define-error): The error conditions may be constant
+	lists, so use `append' to concatenate them.
+
 2015-02-06  Wolfgang Jenkner  <wjenkner@inode.at>
 
 	* 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)