diff options
| author | Richard Stallman <rms@gnu.org> | 2020-02-06 18:30:47 -0500 |
|---|---|---|
| committer | Richard Stallman <rms@gnu.org> | 2020-02-06 18:30:47 -0500 |
| commit | c4be80112556e06bd7e92138e44051cc8c62e709 (patch) | |
| tree | 2392fb385569e10ad9d4d0ab2a48a1771131bf4e /lisp/emacs-lisp/byte-opt.el | |
| parent | 53f0de5d7719b43f184ce1a910f14882aedc50bc (diff) | |
| parent | 15814d0ccd95848a2a0513d93ab718a49b289598 (diff) | |
| download | emacs-c4be80112556e06bd7e92138e44051cc8c62e709.tar.gz emacs-c4be80112556e06bd7e92138e44051cc8c62e709.tar.bz2 emacs-c4be80112556e06bd7e92138e44051cc8c62e709.zip | |
Merge
Diffstat (limited to 'lisp/emacs-lisp/byte-opt.el')
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 38bf1121e8a..fe0930c684b 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -498,15 +498,12 @@ form) ((eq fn 'condition-case) - (if byte-compile--use-old-handlers - ;; Will be optimized later. - form - `(condition-case ,(nth 1 form) ;Not evaluated. - ,(byte-optimize-form (nth 2 form) for-effect) - ,@(mapcar (lambda (clause) - `(,(car clause) - ,@(byte-optimize-body (cdr clause) for-effect))) - (nthcdr 3 form))))) + `(condition-case ,(nth 1 form) ;Not evaluated. + ,(byte-optimize-form (nth 2 form) for-effect) + ,@(mapcar (lambda (clause) + `(,(car clause) + ,@(byte-optimize-body (cdr clause) for-effect))) + (nthcdr 3 form)))) ((eq fn 'unwind-protect) ;; the "protected" part of an unwind-protect is compiled (and thus @@ -521,12 +518,7 @@ ((eq fn 'catch) (cons fn (cons (byte-optimize-form (nth 1 form) nil) - (if byte-compile--use-old-handlers - ;; The body of a catch is compiled (and thus - ;; optimized) as a top-level form, so don't do it - ;; here. - (cdr (cdr form)) - (byte-optimize-body (cdr form) for-effect))))) + (byte-optimize-body (cdr form) for-effect)))) ((eq fn 'ignore) ;; Don't treat the args to `ignore' as being |