branch: elpa/evil-matchit
commit 289982cbee231e00f2569236ef25fc65cf6af916
Author: Chen Bin <chenbin...@gmail.com>
Commit: Chen Bin <chenbin...@gmail.com>
doc
---
README.org | 2 +-
evil-matchit-c.el | 4 ++--
evil-matchit-cmake.el | 4 ++--
evil-matchit-diff.el | 4 ++--
evil-matchit-elixir.el | 4 ++--
evil-matchit-fortran.el | 4 ++--
evil-matchit-html.el | 4 ++--
evil-matchit-javascript.el | 4 ++--
evil-matchit-latex.el | 4 ++--
evil-matchit-markdown.el | 4 ++--
evil-matchit-ocaml.el | 2 +-
evil-matchit-org.el | 4 ++--
evil-matchit-python.el | 4 ++--
evil-matchit-ruby.el | 4 ++--
evil-matchit-script.el | 4 ++--
evil-matchit-sh.el | 4 ++--
evil-matchit-simple.el | 4 ++--
evil-matchit-sql.el | 4 ++--
evil-matchit-template.el | 4 ++--
evil-matchit-verilog.el | 4 ++--
evil-matchit.el | 49 +++++++++++++++++++++++-----------------------
pkg.sh | 2 +-
22 files changed, 63 insertions(+), 64 deletions(-)
diff --git a/README.org b/README.org
index 02775f31cd..0f3766f0a8 100644
--- a/README.org
+++ b/README.org
@@ -1,4 +1,4 @@
-* evil-matchit (v2.3.4)
+* evil-matchit
[[http://melpa.org/#/evil-matchit][file:http://melpa.org/packages/evil-matchit-badge.svg]]
[[http://stable.melpa.org/#/evil-matchit][file:http://stable.melpa.org/packages/evil-matchit-badge.svg]]
diff --git a/evil-matchit-c.el b/evil-matchit-c.el
index 8bb865f518..500dcbcda1 100644
--- a/evil-matchit-c.el
+++ b/evil-matchit-c.el
@@ -1,8 +1,8 @@
;;; evil-matchit-c.el --c like language (c/c++/perl/java/javascript) plugin of
evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-cmake.el b/evil-matchit-cmake.el
index 6e15f62f1e..5d16e9dff6 100644
--- a/evil-matchit-cmake.el
+++ b/evil-matchit-cmake.el
@@ -1,8 +1,8 @@
;;; evil-matchit-cmake.el ---cmake (ruby/lua) plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-diff.el b/evil-matchit-diff.el
index 691d1b2aef..4c9a7ab8d2 100644
--- a/evil-matchit-diff.el
+++ b/evil-matchit-diff.el
@@ -1,8 +1,8 @@
;;; evil-matchit-diff.el -- diff-mode plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-elixir.el b/evil-matchit-elixir.el
index b089e9ddb4..e42b9a4ee7 100644
--- a/evil-matchit-elixir.el
+++ b/evil-matchit-elixir.el
@@ -1,8 +1,8 @@
;;; evil-matchit-elixir.el ---elixir plugin of evil-matchit
-;; Copyright (C) 2018 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2018-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-fortran.el b/evil-matchit-fortran.el
index 047a9fd4f7..f5f45dece3 100644
--- a/evil-matchit-fortran.el
+++ b/evil-matchit-fortran.el
@@ -1,8 +1,8 @@
;;; evil-matchit-fortran.el ---fortran (ruby/lua) plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-html.el b/evil-matchit-html.el
index 9c6bdc351c..33ae906795 100644
--- a/evil-matchit-html.el
+++ b/evil-matchit-html.el
@@ -1,8 +1,8 @@
;;; evil-matchit-html.el ---html plugin of evil-matchit
-;; Copyright (C) 2014-2020 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-javascript.el b/evil-matchit-javascript.el
index 562f567799..3a8477361a 100644
--- a/evil-matchit-javascript.el
+++ b/evil-matchit-javascript.el
@@ -1,8 +1,8 @@
;;; evil-matchit-javascript.el --- simple match plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-latex.el b/evil-matchit-latex.el
index 3fe6a0c1a5..1a5aa556e9 100644
--- a/evil-matchit-latex.el
+++ b/evil-matchit-latex.el
@@ -1,8 +1,8 @@
;;; evil-matchit-latex.el ---latex plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-markdown.el b/evil-matchit-markdown.el
index 7908a61277..41c34cfa7c 100644
--- a/evil-matchit-markdown.el
+++ b/evil-matchit-markdown.el
@@ -1,8 +1,8 @@
;;; evil-matchit-markdown.el --- markdown-mode plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-ocaml.el b/evil-matchit-ocaml.el
index 56630594a1..5b91312286 100644
--- a/evil-matchit-ocaml.el
+++ b/evil-matchit-ocaml.el
@@ -1,6 +1,6 @@
;;; evil-matchit-ocaml.el -- tuareg-mode plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
;; Author: Tomasz Kołodziejski <tkolodziej...@gmail.com>
diff --git a/evil-matchit-org.el b/evil-matchit-org.el
index 61357a3077..89aa268359 100644
--- a/evil-matchit-org.el
+++ b/evil-matchit-org.el
@@ -1,8 +1,8 @@
;;; evil-matchit-org.el --- org-mode plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-python.el b/evil-matchit-python.el
index 9f195a4bca..7135f75321 100644
--- a/evil-matchit-python.el
+++ b/evil-matchit-python.el
@@ -1,8 +1,8 @@
;;; evil-matchit-python.el ---python plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-ruby.el b/evil-matchit-ruby.el
index 1549d1f042..19672a709f 100644
--- a/evil-matchit-ruby.el
+++ b/evil-matchit-ruby.el
@@ -1,8 +1,8 @@
;;; evil-matchit-ruby.el ---ruby plugin of evil-matchit
-;; Copyright (C) 2014-2019 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-script.el b/evil-matchit-script.el
index 0ea760b5e8..4d2a847303 100644
--- a/evil-matchit-script.el
+++ b/evil-matchit-script.el
@@ -1,8 +1,8 @@
;;; evil-matchit-script.el ---script (ruby/lua) plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-sh.el b/evil-matchit-sh.el
index f85b0c127a..1015a27429 100644
--- a/evil-matchit-sh.el
+++ b/evil-matchit-sh.el
@@ -1,8 +1,8 @@
;;; evil-matchit-sh.el ---sh (bash/zsh) plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-simple.el b/evil-matchit-simple.el
index 0dfd4c8864..9e2f972239 100644
--- a/evil-matchit-simple.el
+++ b/evil-matchit-simple.el
@@ -1,9 +1,9 @@
;;; evil-matchit-simple.el --- simple match plugin of evil-matchit
-;; Copyright (C) 2014-2020 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-sql.el b/evil-matchit-sql.el
index 5ba424bf09..4a3382118c 100644
--- a/evil-matchit-sql.el
+++ b/evil-matchit-sql.el
@@ -1,8 +1,8 @@
;;; evil-matchit-sql.el ---sql plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-template.el b/evil-matchit-template.el
index d07b7c698a..9d50b6c775 100644
--- a/evil-matchit-template.el
+++ b/evil-matchit-template.el
@@ -1,8 +1,8 @@
;;; evil-matchit-template.el --- web template plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit-verilog.el b/evil-matchit-verilog.el
index 0f29b40196..eed25fa911 100644
--- a/evil-matchit-verilog.el
+++ b/evil-matchit-verilog.el
@@ -1,8 +1,8 @@
;;; evil-matchit-verilog.el ---verilog plugin of evil-matchit
-;; Copyright (C) 2014-2017 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; This file is not part of GNU Emacs.
diff --git a/evil-matchit.el b/evil-matchit.el
index d953d7f9fc..81d56f14d8 100644
--- a/evil-matchit.el
+++ b/evil-matchit.el
@@ -1,10 +1,10 @@
;;; evil-matchit.el --- Vim matchit ported to Evil
-;; Copyright (C) 2014-2018 Chen Bin <chenbin...@gmail.com>
+;; Copyright (C) 2014-2020 Chen Bin <chenbin DOT sh AT gmail DOT com>
-;; Author: Chen Bin <chenbin...@gmail.com>
+;; Author: Chen Bin <chenbin DOT sh AT gmail DOT com>
;; URL: http://github.com/redguardtoo/evil-matchit
-;; Version: 2.3.4
+;; Version: 2.3.5
;; Keywords: matchit vim evil
;; Package-Requires: ((evil "1.2.0") (emacs "24.4"))
;;
@@ -34,9 +34,9 @@
;; Then press % or `evilmi-jump-items' to jump between then matched pair.
;; Text object "%" is also provided.
;;
-;; The shortcut "%" is defined in `evilmi-shortcut'. It's both the name of
-;; text object and shortcut of `evilmi-jump-items'. Some people prefer set it
-;; to "m". Here is sample setup:
+;; The shortcut "%" is defined in `evilmi-shortcut'. It's both the name of
+;; text object and shortcut of `evilmi-jump-items'. Some people prefer set it
+;; to "m". Here is sample setup:
;;
;; (setq evilmi-shortcut "m")
;; (global-evil-matchit-mode 1)
@@ -51,8 +51,7 @@
(require 'evil)
(require 'evil-matchit-sdk)
-(defvar evilmi-plugins '(emacs-lisp-mode
- ((evilmi-simple-get-tag evilmi-simple-jump)))
+(defvar evilmi-plugins '(emacs-lisp-mode ((evilmi-simple-get-tag
evilmi-simple-jump)))
"The Matrix to of algorithms.")
(defvar evilmi-may-jump-by-percentage t
@@ -186,8 +185,8 @@ If IS-FORWARD is t, jump forward; or else jump backward."
(if evilmi-debug (message "evilmi--scan-sexps called => rlt=%s lvl=%s" rlt
lvl))
rlt))
-(defun evilmi--find-the-other-quote-char (ff is-forward ch)
- "The end character under cursor has different font-face from FF."
+(defun evilmi--find-the-other-quote-char (font-face is-forward char)
+ "The end character under cursor has different font from FONT-FACE."
(let* (rlt
got
(delta (if is-forward 1 -1))
@@ -196,8 +195,8 @@ If IS-FORWARD is t, jump forward; or else jump backward."
(while (not got)
(cond
((or (= pos end)
- (and (= ch (evilmi--get-char-at-position (- pos delta)))
- (not (eq ff (get-text-property pos 'face)))))
+ (and (= char (evilmi--get-char-at-position (- pos delta)))
+ (not (eq font-face (get-text-property pos 'face)))))
(setq rlt (if is-forward pos (+ 1 pos)))
(setq got t))
(t
@@ -221,12 +220,13 @@ If IS-FORWARD is t, jump forward; or else jump backward."
(if evilmi-debug (message "evilmi--find-position-to-jump return %s"
(evilmi--adjust-jumpto is-forward rlt)))
(evilmi--adjust-jumpto is-forward rlt)))
-(defun evilmi--tweak-selected-region (ff jump-forward)
+(defun evilmi--tweak-selected-region (font-face jump-forward)
+ "Tweak selected region using FONT-FACE and JUMP-FORWARD."
;; visual-state hack!
- (if (and jump-forward (eq evil-state 'visual) (not ff))
- ;; if ff is non-nil, I control the jump flow from character level,
- ;; so hack to workaround scan-sexps is NOT necessary
- (evil-backward-char)))
+ (when (and jump-forward (eq evil-state 'visual) (not font-face))
+ ;; if font-face is non-nil, I control the jump flow from character level,
+ ;; so hack to workaround scan-sexps is NOT necessary
+ (evil-backward-char)))
(defun evilmi--simple-jump ()
"Alternative for `evil-jump-item'."
@@ -247,8 +247,6 @@ If IS-FORWARD is t, jump forward; or else jump backward."
(message "evilmi--operate-on-item called => %s (point)=%d" num (point)))
(let* ((jump-rules (plist-get evilmi-plugins major-mode))
rlt
- (i 0)
- rule
jumped
ideal-dest)
@@ -426,7 +424,7 @@ If IS-FORWARD is t, jump forward; or else jump backward."
;;;###autoload
(defun evilmi-select-items (&optional num)
- "Select items/tags and the region between them."
+ "Select NUM items/tags and the region between them."
(interactive "p")
(let* ((selected-region (evilmi--region-to-select-or-delete num)))
(when selected-region
@@ -435,7 +433,7 @@ If IS-FORWARD is t, jump forward; or else jump backward."
;;;###autoload
(defun evilmi-delete-items (&optional num)
- "Delete items/tags and the region between them."
+ "Delete NUM items/tags and the region between them."
(interactive "p")
(let* ((selected-region (evilmi--region-to-select-or-delete num)))
;; 1+ because the line feed
@@ -462,7 +460,7 @@ If IS-FORWARD is t, jump forward; or else jump backward."
;;;###autoload (autoload 'evilmi-jump-items "evil-matchit" nil t)
(evil-define-command evilmi-jump-items (&optional num)
- "Jump between items."
+ "Jump between items NUM times."
:repeat nil
:jump t
(interactive "P")
@@ -474,8 +472,9 @@ If IS-FORWARD is t, jump forward; or else jump backward."
;;;###autoload
(defun evilmi-version()
+ "Print version."
(interactive)
- (message "2.3.4"))
+ (message "2.3.5"))
;;;###autoload
(define-minor-mode evil-matchit-mode
@@ -495,12 +494,12 @@ If IS-FORWARD is t, jump forward; or else jump backward."
;;;###autoload
(defun turn-on-evil-matchit-mode ()
- "Enable evil-matchit-mode in the current buffer."
+ "Enable `evil-matchit-mode' in the current buffer."
(evil-matchit-mode 1))
;;;###autoload
(defun turn-off-evil-matchit-mode ()
- "Disable evil-matchit-mode in the current buffer."
+ "Disable `evil-matchit-mode' in the current buffer."
(evil-matchit-mode -1))
;;;###autoload
diff --git a/pkg.sh b/pkg.sh
index 1eb61b94d7..479e589059 100755
--- a/pkg.sh
+++ b/pkg.sh
@@ -1,6 +1,6 @@
#!/bin/bash
name=evil-matchit
-version=2.3.4
+version=2.3.5
pkg=$name-$version
mkdir $pkg
cp README.org $pkg
![http://melpa.org/#/evil-matchit][file:http://melpa.org/packages/evil-matchit-badge.svg](http://melpa.org/#/evil-matchit][file:http://melpa.org/packages/evil-matchit-badge.svg){kind=link}
![http://stable.melpa.org/#/evil-matchit][file:http://stable.melpa.org/packages/evil-matchit-badge.svg](http://stable.melpa.org/#/evil-matchit][file:http://stable.melpa.org/packages/evil-matchit-badge.svg){kind=link}