[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3fc745d 2/2: Fix json error-definition condition bu
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 3fc745d 2/2: Fix json error-definition condition build error |
Date: |
Fri, 06 Feb 2015 03:04:29 +0000 |
branch: master
commit 3fc745d5de3ef7825345132dbcd20784e5cab0e3
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
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 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60746ce..b60e410 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06 Lars Ingebrigtsen <address@hidden>
+
+ * subr.el (define-error): The error conditions may be constant
+ lists, so use `append' to concatenate them.
+
2015-02-06 Wolfgang Jenkner <address@hidden>
* net/network-stream.el (network-stream-open-tls): Respect the
diff --git a/lisp/subr.el b/lisp/subr.el
index 68cd230..3b27b33 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)