diff options
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/lisp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/multisession.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 5cbd4213028..936d5f91a06 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el | |||
| @@ -331,7 +331,7 @@ On error, location of point is unspecified." | |||
| 331 | (if no-syntax-crossing | 331 | (if no-syntax-crossing |
| 332 | ;; Assume called interactively; don't signal an error. | 332 | ;; Assume called interactively; don't signal an error. |
| 333 | (user-error "At top level") | 333 | (user-error "At top level") |
| 334 | (signal (car err) (cdr err))))))) | 334 | (signal err)))))) |
| 335 | (setq arg (- arg inc))))) | 335 | (setq arg (- arg inc))))) |
| 336 | 336 | ||
| 337 | (defun kill-sexp (&optional arg interactive) | 337 | (defun kill-sexp (&optional arg interactive) |
diff --git a/lisp/emacs-lisp/multisession.el b/lisp/emacs-lisp/multisession.el index f3cc4b73338..8df3d9e4b22 100644 --- a/lisp/emacs-lisp/multisession.el +++ b/lisp/emacs-lisp/multisession.el | |||
| @@ -295,7 +295,7 @@ DOC should be a doc string, and ARGS are keywords as applicable to | |||
| 295 | (setq i (1+ i) | 295 | (setq i (1+ i) |
| 296 | last-error err) | 296 | last-error err) |
| 297 | (sleep-for (+ 0.1 (/ (float (random 10)) 10)))))) | 297 | (sleep-for (+ 0.1 (/ (float (random 10)) 10)))))) |
| 298 | (signal (car last-error) (cdr last-error))))) | 298 | (signal last-error)))) |
| 299 | 299 | ||
| 300 | (defun multisession--object-file-name (object) | 300 | (defun multisession--object-file-name (object) |
| 301 | (expand-file-name | 301 | (expand-file-name |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index c30f7758df4..706614e9df1 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1219,8 +1219,7 @@ errors signaled by ERROR-FORM or by BODY). | |||
| 1219 | (when (condition-case ,err | 1219 | (when (condition-case ,err |
| 1220 | (progn ,@before-body t) | 1220 | (progn ,@before-body t) |
| 1221 | (error (funcall error-function) | 1221 | (error (funcall error-function) |
| 1222 | (unless noerror | 1222 | (unless noerror (signal ,err)))) |
| 1223 | (signal (car ,err) (cdr ,err))))) | ||
| 1224 | (funcall ,body))))) | 1223 | (funcall ,body))))) |
| 1225 | 1224 | ||
| 1226 | (cl-defun package--with-response-buffer-1 (url body &key async file error-function noerror &allow-other-keys) | 1225 | (cl-defun package--with-response-buffer-1 (url body &key async file error-function noerror &allow-other-keys) |