emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/js2-mode 90e1434 48/61: Merge pull request #558 from ph


From: Dmitry Gutov
Subject: [elpa] externals/js2-mode 90e1434 48/61: Merge pull request #558 from phst/edebug
Date: Sun, 20 Dec 2020 12:20:09 -0500 (EST)

branch: externals/js2-mode
commit 90e1434146988e855ade79c5acefc156f6420d7a
Merge: df9d74e b4ede70
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>

    Merge pull request #558 from phst/edebug
    
    Fix &rest syntax in cl-destructuring-bind
---
 js2-mode.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index 9c64341..b91d583 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -7702,7 +7702,8 @@ For instance, processing a nested scope requires a parent 
function node."
   (let (result fn parent-qname p elem)
     (dolist (entry js2-imenu-recorder)
       ;; function node goes first
-      (cl-destructuring-bind (current-fn &rest (&whole chain head &rest)) entry
+      (cl-destructuring-bind
+          (current-fn &rest (&whole chain head &rest rest)) entry
         ;; Examine head's defining scope:
         ;; Pre-processed chain, or top-level/external, keep as-is.
         (if (or (stringp head) (js2-node-top-level-decl-p head))
@@ -11684,7 +11685,7 @@ highlighting features of `js2-mode'."
         (let ((inhibit-read-only t))
           (erase-buffer)
           (dolist (err all-errs)
-            (cl-destructuring-bind ((msg-key beg _end &rest) type line) err
+            (cl-destructuring-bind ((msg-key beg _end &rest rest) type line) 
err
               (insert-text-button
                (format "line %d: %s" line (js2-get-msg msg-key))
                'face type



reply via email to

[Prev in Thread] Current Thread [Next in Thread]