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 60746cef3f32cf28aad8d82d445df70612244e74..b60e410f96ef379a987c3e580661a471de416b77 100644 (file)
--- 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 68cd230c5e24324d0c2169afe717e78779309552..3b27b33d960f5893191f9b9f1678435477d8067d 100644 (file)
--- 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)