branch: master
commit 40a43b1cf77aafaba8cd6452f0a7147c36dc489a
Author: Jimmy Yuen Ho Wong <[email protected]>
Commit: Jimmy Yuen Ho Wong <[email protected]>
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.
