Merge commit 'ac93b9eef9b6ac44d187b9688d68a7a5f205b3fe' from js2-mode

[gnu-emacs-elpa] / packages / js2-mode / js2-mode.el

diff --git a/js2-mode.el b/packages/js2-mode/js2-mode.el
similarity index 99%
rename from js2-mode.el
rename to packages/js2-mode/js2-mode.el
index 2dd5d9d8f3fd4e8cd0cffdd8a62d5319ce4c85dc..4fc2823657827197a3041f387ad210dbfa231614 100644 (file)
--- a/js2-mode.el
+++ b/packages/js2-mode/js2-mode.el
@@ -10165,7 +10165,7 @@ EXPR is the first expression after the opening left-bracket.
 POS is the beginning of the LB token preceding EXPR.
 We should have just parsed the 'for' keyword before calling this function."
   (let ((current-scope js2-current-scope)
-        loops first filter result)
+        loops filter result)
     (unwind-protect
         (progn
           (while (js2-match-token js2-FOR)
@@ -10174,7 +10174,7 @@ We should have just parsed the 'for' keyword before calling this function."
               (push loop loops)
               (js2-parse-comp-loop loop)))
           ;; First loop takes expr scope's parent.
-          (setf (js2-scope-parent-scope (setq first (car (last loops))))
+          (setf (js2-scope-parent-scope (car (last loops)))
                 (js2-scope-parent-scope current-scope))
           ;; Set expr scope's parent to the last loop.
           (setf (js2-scope-parent-scope current-scope) (car loops))