[Emacs-diffs] master b62d795 1/3: edebug.el: Disambiguate vector specifications

[Johan Bockgard]

branch: master
commit b62d7956bea87eba82a86bfeba2d637c7ef4016c
Author: Johan Bockgård <address@hidden>
Commit: Johan Bockgård <address@hidden>

    edebug.el: Disambiguate vector specifications
    
    * lisp/emacs-lisp/edebug.el (edebug-match-list): Always treat
    `(vector ...)' as a vector specification, not as a sublist.
---
 lisp/emacs-lisp/edebug.el |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index d0668bb..98fb7e9 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1725,6 +1725,17 @@ expressions; a `progn' form will be returned enclosing 
these forms."
           (t
            (error "Bad spec: %s" specs)))))
 
+       ((eq 'vector spec)
+       (if (vectorp form)
+           ;; Special case: match a vector with the specs.
+           (let ((result (edebug-match-sublist
+                          (edebug-new-cursor
+                           form (cdr (edebug-top-offset cursor)))
+                          (cdr specs))))
+             (edebug-move-cursor cursor)
+             (list (apply 'vector result)))
+         (edebug-no-match cursor "Expected" specs)))
+
        ((listp form)
        (prog1
            (list (edebug-match-sublist
@@ -1734,15 +1745,6 @@ expressions; a `progn' form will be returned enclosing 
these forms."
                   specs))
          (edebug-move-cursor cursor)))
 
-       ((and (eq 'vector spec) (vectorp form))
-       ;; Special case: match a vector with the specs.
-       (let ((result (edebug-match-sublist
-                      (edebug-new-cursor
-                       form (cdr (edebug-top-offset cursor)))
-                      (cdr specs))))
-         (edebug-move-cursor cursor)
-         (list (apply 'vector result))))
-
        (t (edebug-no-match cursor "Expected" specs)))
       )))