[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/evil-nerd-commenter 3089141dd2 183/235: Merge pull request
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/evil-nerd-commenter 3089141dd2 183/235: Merge pull request #95 from leungbk/forward-line |
Date: |
Thu, 6 Jan 2022 02:59:46 -0500 (EST) |
branch: elpa/evil-nerd-commenter
commit 3089141dd2dfa0730c38d7efcb4bb6b74e321f34
Merge: 8089308aad 341f78551b
Author: Chen Bin <chenbin.sh@gmail.com>
Commit: GitHub <noreply@github.com>
Merge pull request #95 from leungbk/forward-line
Fix regression for non-visual modes.
---
evil-nerd-commenter.el | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/evil-nerd-commenter.el b/evil-nerd-commenter.el
index 0824bcf929..e93635fd0a 100644
--- a/evil-nerd-commenter.el
+++ b/evil-nerd-commenter.el
@@ -195,6 +195,15 @@ See
http://lists.gnu.org/archive/html/bug-gnu-emacs/2013-03/msg00891.html."
(setq comment-start "-# ")
(setq comment-start-skip "-##*[ \t]*"))))
+(defun evilnc--forward-line (num)
+ "Move NUM source or screen lines forward, depending on visual-line settings."
+ (if (or (and visual-line-mode
+ (or (not evil-mode)
+ (bound-and-true-p evil-respect-visual-line-mode)))
+ (eq display-line-numbers-type 'visual))
+ (vertical-motion num)
+ (forward-line num)))
+
(defun evilnc--operation-on-lines-or-region (fn &optional num)
"Apply FN on NUM lines or selected region."
(cond
@@ -202,7 +211,7 @@ See
http://lists.gnu.org/archive/html/bug-gnu-emacs/2013-03/msg00891.html."
((not (region-active-p))
(let* ((b (line-beginning-position)) e)
(save-excursion
- (vertical-motion (- num 1))
+ (evilnc--forward-line (- num 1))
(setq e (line-end-position)))
(funcall fn b e)))
@@ -592,7 +601,7 @@ CORRECT comment syntax will be used for
C++/Java/Javascript."
(t
(save-excursion
(when (< num 0)
- (vertical-motion (1+ num))
+ (evilnc--forward-line (1+ num))
(setq num (- 0 num)))
(evilnc--operation-on-lines-or-region '(lambda (b e)
(evilnc--fix-buggy-major-modes)
@@ -612,7 +621,7 @@ Then we operate the expanded region. NUM is ignored."
(interactive "p")
;; support negative number
(when (< num 0)
- (vertical-motion (1+ num))
+ (evilnc--forward-line (1+ num))
(setq num (- 0 num)))
(let* ((original-column (current-column)))
@@ -651,7 +660,7 @@ Then we operate the expanded region. NUM is ignored."
(interactive "p")
;; support negative number
(when (< num 0)
- (vertical-motion (1+ num))
+ (evilnc--forward-line (1+ num))
(setq num (- 0 num)))
(evilnc--operation-on-lines-or-region
- [nongnu] elpa/evil-nerd-commenter c44836d279 149/235: Merge pull request #73 from PythonNut/patch-1, (continued)
- [nongnu] elpa/evil-nerd-commenter c44836d279 149/235: Merge pull request #73 from PythonNut/patch-1, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 29ed027b53 150/235: Remove error and some warnings, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter bb47704a10 155/235: Do not byte-compile evil-nerd-commenter-operator.el, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 76fd0c5692 160/235: go to original column after copy and comment, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter a32e12d16d 166/235: add evilnc-imenu-create-index-function, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 41d4370921 165/235: Fixed: missing one char when comment end is (point-max), ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 912a967fe5 167/235: avoid duplicates in imenu comments, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 275c95c89c 172/235: Merge pull request #88 from mssdvd/master, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter c68ad3346f 170/235: Add an option to not define keybindings in Emacs mode, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 8089308aad 181/235: Merge pull request #94 from leungbk/vertical-motion, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 3089141dd2 183/235: Merge pull request #95 from leungbk/forward-line,
ELPA Syncer <=
- [nongnu] elpa/evil-nerd-commenter 3cf6b1e746 174/235: can comment or uncomment jsx tag(s), ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 72d4aacd28 187/235: more unit test, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 5cf8755264 191/235: clean code. more unit test. bump 3.3.6, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter f510a491c1 195/235: support js2-rjsx-mode, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter 9c87ea30fa 199/235: wording, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter ce3530406c 201/235: fixed CI, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter a5555ff02a 202/235: remove legacy code on old version of web-mode, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter d664ad5af7 203/235: clean code, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter c9fa23ee7e 206/235: evil operator try to comment on whole lines if possible, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-nerd-commenter fd2fba722e 205/235: clean keybinding setup code, ELPA Syncer, 2022/01/06