[elpa] master 3bea9ab 14/22: Merge pull request #498 from wyuenho/fix-short-name-for-emacs26

[Dmitry Gutov]

branch: master
commit 3bea9ab39b6c0b6dd442d69fe53183c1f7652284
Merge: 1b0e174 40a43b1
Author: Dmitry Gutov <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #498 from wyuenho/fix-short-name-for-emacs26
    
    Fix broken js2-node-short-name for Emacs 26
---
 js2-mode.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js2-mode.el b/js2-mode.el
index c836fa2..5058020 100644
--- a/js2-mode.el
+++ b/js2-mode.el
@@ -4551,8 +4551,11 @@ If N has no parent pointer, returns N."
 
 (defsubst js2-node-short-name (n)
   "Return the short name of node N as a string, e.g. `js2-if-node'."
-  (substring (symbol-name (aref n 0))
-             (length "cl-struct-")))
+  (let ((name (symbol-name (aref n 0))))
+    (if (string-prefix-p "cl-struct-" name)
+        (substring (symbol-name (aref n 0))
+                   (length "cl-struct-"))
+      name)))
 
 (defun js2-node-child-list (node)
   "Return the child list for NODE, a Lisp list of nodes.