Mark 'catch' and 'condition-case' bytecodes as obsolete

They have not been generated by the byte-compiler since Emacs 25.

* lisp/emacs-lisp/bytecomp.el (byte-catch, byte-condition-case):
* src/bytecode.c (BYTE_CODES, exec_byte_code):
Mark as obsolete (since Emacs 25; they were still generated in 24.4).

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index cdcc9380163aa33381a488d43435e76f1acdf371..20c0fc32fa8b66dd08aca2f917649260b1ed1421 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -719,14 +719,15 @@ otherwise pop it")
   "to make a binding to record entire window configuration")
 (byte-defop 140  0 byte-save-restriction
   "to make a binding to record the current buffer clipping restrictions")
-(byte-defop 141 -1 byte-catch
+(byte-defop 141 -1 byte-catch-OBSOLETE   ; Not generated since Emacs 25.
   "for catch.  Takes, on stack, the tag and an expression for the body")
 (byte-defop 142 -1 byte-unwind-protect
   "for unwind-protect.  Takes, on stack, an expression for the unwind-action")
 
 ;; For condition-case.  Takes, on stack, the variable to bind,
 ;; an expression for the body, and a list of clauses.
-(byte-defop 143 -2 byte-condition-case)
+;; Not generated since Emacs 25.
+(byte-defop 143 -2 byte-condition-case-OBSOLETE)
 
 (byte-defop 144  0 byte-temp-output-buffer-setup-OBSOLETE)
 (byte-defop 145 -1 byte-temp-output-buffer-show-OBSOLETE)

diff --git a/src/bytecode.c b/src/bytecode.c
index 9e75c9012e0815be37a156d2fbb3426b82799121..4624379756d7bef701468d9e579a6d8cedddc0ba 100644 (file)
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -220,10 +220,10 @@ DEFINE (Bdup, 0211)                                                       \
 DEFINE (Bsave_excursion, 0212)                                         \
 DEFINE (Bsave_window_excursion, 0213) /* Obsolete since Emacs-24.1.  */        \
 DEFINE (Bsave_restriction, 0214)                                       \
-DEFINE (Bcatch, 0215)                                                  \
+DEFINE (Bcatch, 0215)          /* Obsolete since Emacs-25.  */         \
                                                                        \
 DEFINE (Bunwind_protect, 0216)                                         \
-DEFINE (Bcondition_case, 0217)                                         \
+DEFINE (Bcondition_case, 0217) /* Obsolete since Emacs-25.  */         \
 DEFINE (Btemp_output_buffer_setup, 0220) /* Obsolete since Emacs-24.1.  */ \
 DEFINE (Btemp_output_buffer_show, 0221)  /* Obsolete since Emacs-24.1.  */ \
                                                                        \
@@ -763,7 +763,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
                                 save_restriction_save ());
          NEXT;
 
-       CASE (Bcatch):          /* Obsolete since 24.4.  */
+       CASE (Bcatch):          /* Obsolete since 25.  */
          {
            Lisp_Object v1 = POP;
            TOP = internal_catch (TOP, eval_sub, v1);
@@ -807,7 +807,7 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
            NEXT;
          }
 
-       CASE (Bcondition_case):         /* Obsolete since 24.4.  */
+       CASE (Bcondition_case):         /* Obsolete since 25.  */
          {
            Lisp_Object handlers = POP, body = POP;
            TOP = internal_lisp_condition_case (TOP, body, handlers);