branch: elpa/evil-matchit commit 2d0888423e9988f02bf497c4f0788c52cbde6772 Author: Chen Bin <chenbin...@gmail.com> Commit: Chen Bin <chenbin...@gmail.com>
fixed snapshot ci --- evil-matchit-c.el | 2 +- evil-matchit-cmake.el | 2 +- evil-matchit-diff.el | 2 +- evil-matchit-elixir.el | 2 +- evil-matchit-fortran.el | 2 +- evil-matchit-html.el | 2 +- evil-matchit-indent.el | 7 ++----- evil-matchit-javascript.el | 2 +- evil-matchit-latex.el | 2 +- evil-matchit-markdown.el | 2 +- evil-matchit-octave.el | 2 +- evil-matchit-org.el | 7 ++----- evil-matchit-prog.el | 2 +- evil-matchit-python.el | 2 +- evil-matchit-ruby.el | 2 +- evil-matchit-script.el | 2 +- evil-matchit-sdk.el | 3 ++- evil-matchit-sh.el | 2 +- evil-matchit-simple.el | 8 +++----- evil-matchit-sql.el | 2 +- evil-matchit-template.el | 2 +- evil-matchit-terminal.el | 2 +- evil-matchit-verilog.el | 5 +++-- evil-matchit-yaml.el | 2 +- evil-matchit.el | 2 +- 25 files changed, 32 insertions(+), 38 deletions(-) diff --git a/evil-matchit-c.el b/evil-matchit-c.el index 5b1a1cfe07..03b7481d53 100644 --- a/evil-matchit-c.el +++ b/evil-matchit-c.el @@ -1,4 +1,4 @@ -;;; evil-matchit-c.el -- C like language (c/c++/perl/java/javascript) plugin of evil-matchit +;;; evil-matchit-c.el -- C like language (c/c++/perl/java/javascript) plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-cmake.el b/evil-matchit-cmake.el index 9e3c8696f7..cfb4d1b5d8 100644 --- a/evil-matchit-cmake.el +++ b/evil-matchit-cmake.el @@ -1,4 +1,4 @@ -;;; evil-matchit-cmake.el --- cmake plugin of evil-matchit +;;; evil-matchit-cmake.el --- cmake plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-diff.el b/evil-matchit-diff.el index 5a9127e9ab..146c975c78 100644 --- a/evil-matchit-diff.el +++ b/evil-matchit-diff.el @@ -1,4 +1,4 @@ -;;; evil-matchit-diff.el -- diff-mode plugin of evil-matchit +;;; evil-matchit-diff.el -- diff-mode plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-elixir.el b/evil-matchit-elixir.el index dae0d6a1a7..644b16abd1 100644 --- a/evil-matchit-elixir.el +++ b/evil-matchit-elixir.el @@ -1,4 +1,4 @@ -;;; evil-matchit-elixir.el --- elixir plugin of evil-matchit +;;; evil-matchit-elixir.el --- elixir plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2018-2020 Chen Bin diff --git a/evil-matchit-fortran.el b/evil-matchit-fortran.el index e1f6e5cc96..0924e7ea3d 100644 --- a/evil-matchit-fortran.el +++ b/evil-matchit-fortran.el @@ -1,4 +1,4 @@ -;;; evil-matchit-fortran.el --- fortran plugin of evil-matchit +;;; evil-matchit-fortran.el --- fortran plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-html.el b/evil-matchit-html.el index 4ff30d9a53..10b39a6812 100644 --- a/evil-matchit-html.el +++ b/evil-matchit-html.el @@ -1,4 +1,4 @@ -;;; evil-matchit-html.el --- html plugin of evil-matchit +;;; evil-matchit-html.el --- html plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-indent.el b/evil-matchit-indent.el index e08eb4f612..63314d427b 100644 --- a/evil-matchit-indent.el +++ b/evil-matchit-indent.el @@ -1,4 +1,4 @@ -;;; evil-matchit-indent.el --- indent algorithm for evil-matchit +;;; evil-matchit-indent.el --- indent algorithm for evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2021 Chen Bin @@ -51,9 +51,7 @@ It returns regexp to match the line candidate.") (defun evilmi-indent-next-nonempty-line () "Return next non-empty line content or nil." - (let* ((b (line-beginning-position)) - (e (line-end-position)) - (cur-pos (point)) + (let* ((e (line-end-position)) (continue t) line rlt) @@ -63,7 +61,6 @@ It returns regexp to match the line candidate.") (setq line (evilmi-sdk-curline)) (cond ((string-blank-p line) - (setq b (line-beginning-position)) (setq e (line-end-position)) (forward-line)) (t diff --git a/evil-matchit-javascript.el b/evil-matchit-javascript.el index b84d7c6086..dd99a76d1b 100644 --- a/evil-matchit-javascript.el +++ b/evil-matchit-javascript.el @@ -1,4 +1,4 @@ -;;; evil-matchit-javascript.el --- simple match plugin of evil-matchit +;;; evil-matchit-javascript.el --- simple match plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-latex.el b/evil-matchit-latex.el index 804782357f..39f94e0c75 100644 --- a/evil-matchit-latex.el +++ b/evil-matchit-latex.el @@ -1,4 +1,4 @@ -;;; evil-matchit-latex.el --- latex plugin of evil-matchit +;;; evil-matchit-latex.el --- latex plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-markdown.el b/evil-matchit-markdown.el index 76dc3b6c40..9b72dec82d 100644 --- a/evil-matchit-markdown.el +++ b/evil-matchit-markdown.el @@ -1,4 +1,4 @@ -;;; evil-matchit-markdown.el --- markdown-mode plugin of evil-matchit +;;; evil-matchit-markdown.el --- markdown-mode plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-octave.el b/evil-matchit-octave.el index 1c085882a1..ff484a5f0d 100644 --- a/evil-matchit-octave.el +++ b/evil-matchit-octave.el @@ -1,4 +1,4 @@ -;;; evil-matchit-octave.el --- octave plugin of evil-matchit +;;; evil-matchit-octave.el --- octave plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2020 Chen Bin diff --git a/evil-matchit-org.el b/evil-matchit-org.el index d018b10c9a..16d904327c 100644 --- a/evil-matchit-org.el +++ b/evil-matchit-org.el @@ -1,4 +1,4 @@ -;;; evil-matchit-org.el --- org-mode plugin of evil-matchit +;;; evil-matchit-org.el --- org-mode plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2021 Chen Bin @@ -86,8 +86,7 @@ Sub-match is the match defined between '\\(' and '\\)' in regular expression.") "Jump to the matching tag using INFO and NUM." (cond ((< (car info) 0) - (let* (ideal-dest - jumped + (let* (jumped info (lang-f (evilmi--get-embedded-language-major-mode)) (plugin (and lang-f (plist-get evilmi-plugins lang-f)))) @@ -96,8 +95,6 @@ Sub-match is the match defined between '\\(' and '\\)' in regular expression.") (lambda (elem) (setq info (funcall (nth 0 elem))) (when (and info (not jumped)) - ;; before jump, we may need some operation - (setq ideal-dest (funcall (nth 1 elem) info num)) ;; jump only once if the jump is successful (setq jumped t))) plugin)))) diff --git a/evil-matchit-prog.el b/evil-matchit-prog.el index 75250de1e8..f7bd9efe22 100644 --- a/evil-matchit-prog.el +++ b/evil-matchit-prog.el @@ -1,4 +1,4 @@ -;;; evil-matchit-prog.el --- all programming languages plugin of evil-matchit +;;; evil-matchit-prog.el --- all programming languages plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2021 Chen Bin diff --git a/evil-matchit-python.el b/evil-matchit-python.el index 6152a68be7..17e2720410 100644 --- a/evil-matchit-python.el +++ b/evil-matchit-python.el @@ -1,4 +1,4 @@ -;;; evil-matchit-python.el --- python plugin of evil-matchit +;;; evil-matchit-python.el --- python plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-ruby.el b/evil-matchit-ruby.el index 364d4f4c16..257af17287 100644 --- a/evil-matchit-ruby.el +++ b/evil-matchit-ruby.el @@ -1,4 +1,4 @@ -;;; evil-matchit-ruby.el --- ruby plugin of evil-matchit +;;; evil-matchit-ruby.el --- ruby plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-script.el b/evil-matchit-script.el index b23070b786..a9447c2842 100644 --- a/evil-matchit-script.el +++ b/evil-matchit-script.el @@ -1,4 +1,4 @@ -;;; evil-matchit-script.el --- script (vimrc/lua) plugin of evil-matchit +;;; evil-matchit-script.el --- script (vimrc/lua) plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-sdk.el b/evil-matchit-sdk.el index 443b7b16f9..d244c5cdef 100644 --- a/evil-matchit-sdk.el +++ b/evil-matchit-sdk.el @@ -1,4 +1,4 @@ -;;; evil-matchit-sd.el --- evil-matchit SDK +;;; evil-matchit-sd.el --- evil-matchit SDK -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2022 Chen Bin @@ -437,6 +437,7 @@ Rule is looked up in HOWTOS." "Use RLT, NUM, MATCH-TAGS and HOWTOS to jump. Return nil if no matching tag found. Please note (point) is changed after calling this function." + (ignore num) (let* ((orig-tag-info (nth 1 rlt)) (orig-tag-type (nth 1 orig-tag-info)) cur-tag-type diff --git a/evil-matchit-sh.el b/evil-matchit-sh.el index 9e7ae42799..8700a6c3d3 100644 --- a/evil-matchit-sh.el +++ b/evil-matchit-sh.el @@ -1,4 +1,4 @@ -;;; evil-matchit-sh.el --- sh (bash/zsh) plugin of evil-matchit +;;; evil-matchit-sh.el --- sh (bash/zsh) plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-simple.el b/evil-matchit-simple.el index b31175a2a2..6bdb610b01 100644 --- a/evil-matchit-simple.el +++ b/evil-matchit-simple.el @@ -1,4 +1,4 @@ -;;; evil-matchit-simple.el --- simple match plugin of evil-matchit +;;; evil-matchit-simple.el --- simple match plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2021 Chen Bin @@ -70,8 +70,7 @@ If it's t, use simple jump.") ((and (apply 'derived-mode-p evilmi-simple-supported-major-modes) (evilmi-sdk-defun-p)) (let* ((tokens (evilmi-sdk-tokens 5)) - tag - info) + tag) (when (and tokens (> (length tokens) 1) (setq tag @@ -142,8 +141,7 @@ If it's t, use simple jump.") ;;;###autoload (defun evilmi-simple-get-tag () "Get current tag in simple language." - (let* (forward-line-num - (ch (evilmi-simple-following-char)) + (let* ((ch (evilmi-simple-following-char)) rlt) (cond diff --git a/evil-matchit-sql.el b/evil-matchit-sql.el index 4dbc2bcbed..c6934a677f 100644 --- a/evil-matchit-sql.el +++ b/evil-matchit-sql.el @@ -1,4 +1,4 @@ -;;; evil-matchit-sql.el --- sql plugin of evil-matchit +;;; evil-matchit-sql.el --- sql plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-template.el b/evil-matchit-template.el index 30ec9d5cf8..3a751e1c78 100644 --- a/evil-matchit-template.el +++ b/evil-matchit-template.el @@ -1,4 +1,4 @@ -;;; evil-matchit-template.el --- web template plugin of evil-matchit +;;; evil-matchit-template.el --- web template plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit-terminal.el b/evil-matchit-terminal.el index 81dcd5b22e..80314bdbe9 100644 --- a/evil-matchit-terminal.el +++ b/evil-matchit-terminal.el @@ -1,4 +1,4 @@ -;;; evil-matchit-terminal.el --- terminal plugin of evil-matchit +;;; evil-matchit-terminal.el --- terminal plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2020 Chen Bin diff --git a/evil-matchit-verilog.el b/evil-matchit-verilog.el index 57c58b93db..06c63f93d2 100644 --- a/evil-matchit-verilog.el +++ b/evil-matchit-verilog.el @@ -1,4 +1,4 @@ -;;; evil-matchit-verilog.el --- verilog plugin of evil-matchit +;;; evil-matchit-verilog.el --- verilog plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin @@ -133,7 +133,8 @@ "Use INFO returned by `evilmi-verilog-get-tag' and NUM to jump to matched tag." (when info (let* ((orig-keyword (evilmi-sdk-keyword (cadr info)))) - (if evilmi-debug (message "evilmi-verilog-jump called => %s" info)) + (when evilmi-debug + (message "evilmi-verilog-jump called => %s %s" info orig-keyword)) (evilmi-sdk-jump info num evilmi-verilog-match-tags diff --git a/evil-matchit-yaml.el b/evil-matchit-yaml.el index 5e14c9e829..410dba6c42 100644 --- a/evil-matchit-yaml.el +++ b/evil-matchit-yaml.el @@ -1,4 +1,4 @@ -;;; evil-matchit-yaml.el --- yaml plugin of evil-matchit +;;; evil-matchit-yaml.el --- yaml plugin of evil-matchit -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin diff --git a/evil-matchit.el b/evil-matchit.el index fe55c733bb..d0d45e4c51 100644 --- a/evil-matchit.el +++ b/evil-matchit.el @@ -1,4 +1,4 @@ -;;; evil-matchit.el --- Vim matchit ported to Evil +;;; evil-matchit.el --- Vim matchit ported to Evil -*- lexical-binding: t; -*- ;; Copyright (C) 2014-2020 Chen Bin