mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-02 20:16:25 +00:00
Code Issues Releases Activity

Fix json error-definition condition build error

Browse Source 
* lisp/subr.el (define-error): The error conditions may be constant
lists, so use `append' to concatenate them.
This commit is contained in:
Lars Magne Ingebrigtsen 2015-02-06 14:04:13 +11:00
parent bc4996520a
commit 3fc745d5de
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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> 2015-02-06 Wolfgang Jenkner <wjenkner@inode.at>
* net/network-stream.el (network-stream-open-tls): Respect the * net/network-stream.el (network-stream-open-tls): Respect the

2
lisp/subr.el
View File

@ -316,7 +316,7 @@ Defaults to `error'."
(unless parent (setq parent 'error)) (unless parent (setq parent 'error))
(let ((conditions (let ((conditions
(if (consp parent) (if (consp parent)
(apply #'nconc (apply #'append
(mapcar (lambda (parent) (mapcar (lambda (parent)
(cons parent (cons parent
(or (get parent 'error-conditions) (or (get parent 'error-conditions)