[nongnu] elpa/evil-matchit 257d4ab10c 071/244: #41 workaround web-mode v11 issue

[ELPA Syncer]

branch: elpa/evil-matchit
commit 257d4ab10cb5cf253e334a58ec0020cd4446373f
Author: Chen Bin <chenbin.sh@gmail.com>
Commit: Chen Bin <chenbin.sh@gmail.com>

    #41 workaround web-mode v11 issue
---
 README.org           |  2 +-
 evil-matchit-html.el | 17 +++++++++--------
 evil-matchit-pkg.el  |  2 +-
 evil-matchit.el      |  4 ++--
 pkg.sh               |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README.org b/README.org
index 3e660ed2c8..80ffd017a3 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-matchit (v1.5.0)
+* evil-matchit (v1.5.1)
 
 Vim [[http://www.vim.org/scripts/script.php?script_id=39][matchit.vim]] by 
Benji Fisher ported into Emacs.
 
diff --git a/evil-matchit-html.el b/evil-matchit-html.el
index a9a671fd07..1ee81a7229 100644
--- a/evil-matchit-html.el
+++ b/evil-matchit-html.el
@@ -39,8 +39,7 @@
         (char (following-char))
         (p (point))
         (found_tag -1)
-        (rlt nil)
-        )
+        (rlt nil))
 
     (save-excursion
       ;; search backward
@@ -83,21 +82,23 @@
         )
       )
     (setq rlt (list p found_tag ""))
-    rlt
-    )
-  )
+    rlt))
 
 ;;;###autoload
 (defun evilmi-html-jump (rlt NUM)
   (let ((p (nth 0 rlt))
         (tag-type (nth 1 rlt))
         (tag-keyword (nth 2 rlt))
-        )
+        backup-forward-sexp-function)
 
+    ;; web-mode-forward-sexp is assigned to forward-sexp-function
+    ;; it's buggy in web-mode v11, here is the workaround
+    (setq backup-forward-sexp-function forward-sexp-function)
+    (setq forward-sexp-function nil)
     (if (=  1 tag-type) (sgml-skip-tag-backward NUM))
     (if (=  0 tag-type) (sgml-skip-tag-forward NUM))
+    (setq forward-sexp-function backup-forward-sexp-function)
     (point)
-    )
-  )
+    ))
 
 (provide 'evil-matchit-html)
diff --git a/evil-matchit-pkg.el b/evil-matchit-pkg.el
index 937eaeed05..6e122e0938 100644
--- a/evil-matchit-pkg.el
+++ b/evil-matchit-pkg.el
@@ -1,2 +1,2 @@
-(define-package "evil-matchit" "1.5.0"
+(define-package "evil-matchit" "1.5.1"
                 "Vim matchit ported into Emacs (requires EVIL)")
diff --git a/evil-matchit.el b/evil-matchit.el
index 8e76a49c47..81bb8e40c4 100644
--- a/evil-matchit.el
+++ b/evil-matchit.el
@@ -4,7 +4,7 @@
 
 ;; Author: Chen Bin <chenbin.sh@gmail.com>
 ;; URL: http://github.com/redguardtoo/evil-matchit
-;; Version: 1.5.0
+;; Version: 1.5.1
 ;; Keywords: matchit vim evil
 ;; Package-Requires: ((evil "1.0.7"))
 ;;
@@ -272,7 +272,7 @@ If this flag is nil, then 50 means jump 50 times.")
    ))
 
 ;;;###autoload
-(defun evilmi-version() (interactive) (message "1.5.0"))
+(defun evilmi-version() (interactive) (message "1.5.1"))
 
 ;;;###autoload
 (define-minor-mode evil-matchit-mode
diff --git a/pkg.sh b/pkg.sh
index 37488d85e6..2c558dda9a 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-pkg=evil-matchit-1.5.0
+pkg=evil-matchit-1.5.1
 mkdir $pkg
 cp README.org $pkg
 cp *.el $pkg