scratch/comp-static-data a2aa010cd13: Merge branch 'master' into scratch/comp-static-data

[Vibhav Pant]

branch: scratch/comp-static-data
commit a2aa010cd13faf3dc88c4db7377303796775c9fb
Merge: 43bf8ccb66f 4287d56bad5
Author: Vibhav Pant <vibhavp@gmail.com>
Commit: Vibhav Pant <vibhavp@gmail.com>

    Merge branch 'master' into scratch/comp-static-data
---
 lisp/emacs-lisp/byte-opt.el | 10 ++--------
 lisp/progmodes/hideif.el    |  8 ++++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 039cebedb44..b1a46d520e6 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -2227,18 +2227,12 @@ If FOR-EFFECT is non-nil, the return value is assumed 
to be of no importance."
         ;;
         ;; goto   ... --> goto   <delete until TAG or end>
         ;; return ... --> return <delete until TAG or end>
-        ;; (unless a jump-table is being used, where deleting may affect
-         ;; other valid case bodies)
          ;;
         ((and (memq (car lap0) '(byte-goto byte-return))
-              (not (memq (car lap1) '(TAG nil)))
-               ;; FIXME: Instead of deferring simply when jump-tables are
-               ;; being used, keep a list of tags used for switch tags and
-               ;; use them instead (see `byte-compile-inline-lapcode').
-               (not byte-compile-jump-tables))
+              (not (memq (car lap1) '(TAG nil))))
          (setq tmp rest)
          (let ((i 0)
-               (opt-p (memq byte-optimize-log '(t lap)))
+               (opt-p (memq byte-optimize-log '(t byte)))
                str deleted)
            (while (and (setq tmp (cdr tmp))
                        (not (eq 'TAG (car (car tmp)))))
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 4405ce0fe04..836db83c2f3 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -555,8 +555,8 @@ that form should be displayed.")
 (defconst hif-line-concat     "\\\\[ \t]*[\n\r]")
 ;; If `hif-white-regexp' is modified, `hif-tokenize' might need to be modified
 ;; accordingly.
-(defconst hif-white-regexp    (concat "\\(?:\\(?:[ \t]\\|/\\*.*\\*/\\)*"
-                                      "\\(?:" hif-line-concat "\\)?\\)*"))
+(defconst hif-white-regexp    (concat "\\(?:[ \t]\\|/\\*.*?\\*/"
+                                      "\\|\\(?:" hif-line-concat "\\)\\)*"))
 (defconst hif-define-regexp   (concat hif-cpp-prefix "\\(define\\|undef\\)"))
 (defconst hif-id-regexp       (concat "[[:alpha:]_][[:alnum:]_]*"))
 (defconst hif-etc-regexp      "\\.\\.\\.")
@@ -946,8 +946,8 @@ Assuming we've just performed a `hif-token-regexp' lookup."
   (let ((token-list nil)
         ;; Similar to `hif-white-regexp' but keep the spaces if there are
         (white-regexp (concat "\\(?:"
-                              "\\(?:\\([ \t]+\\)\\|\\(?:/\\*.*\\*/\\)?\\)*"
-                              "\\(?:" hif-line-concat "\\)?"
+                              "\\([ \t]+\\)\\|/\\*.*?\\*/"
+                              "\\|\\(?:" hif-line-concat "\\)"
                               "\\)*"))
         token)
     (setq hif-simple-token-only t)