[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/evil-numbers bce451b700 137/145: Use message instead of er
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/evil-numbers bce451b700 137/145: Use message instead of error when no number is found |
Date: |
Thu, 6 Jan 2022 03:00:25 -0500 (EST) |
branch: elpa/evil-numbers
commit bce451b700b5f6d565442b6f4213a17221772ea5
Author: Campbell Barton <ideasman42@gmail.com>
Commit: Campbell Barton <ideasman42@gmail.com>
Use message instead of error when no number is found
---
CHANGELOG.org | 4 ++++
evil-numbers.el | 13 ++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.org b/CHANGELOG.org
index 14ff0c5c98..c9a1c6400b 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -6,6 +6,10 @@
+ =evil-numbers-use-cursor-at-end-of-number= option to match numbers
directly before the cursor
(diverging from VIM's default behavior).
+** Changes
+ + Use =message= instead of =error= when no number is found
+ (don't error since VIM doesn't use an error in this case).
+
** Fixes
+ Fix #27 Number directly before the cursor manipulated when the cursor
can't move forward.
diff --git a/evil-numbers.el b/evil-numbers.el
index afdd2513a7..b41986fb21 100644
--- a/evil-numbers.el
+++ b/evil-numbers.el
@@ -324,7 +324,7 @@ Each item in MATCH-CHARS is a cons pair.
(evil-numbers--skip-chars-impl
ch-skip ch-sep-optional dir 1 limit))
(t
- (error (format "Unknown type %S" ch-skip))))
+ (error (format "Unknown type %S (internal error)" ch-skip))))
;; End of the match.
(when do-match
@@ -643,13 +643,16 @@ result in a number with a + sign."
(lambda (_beg end) (< point-init end))))))
(point)))))
- (if (null point-next)
- (error "No number at point or until end of line")
-
+ (cond
+ ((null point-next)
+ ;; Point not found, note that VIM doesn't report anything in this case.
+ (message "No number at point or until end of line")
+ nil)
+ (t
;; Moves point one position back to conform with VIM,
;; see `evil-adjust-cursor' for details.
(goto-char (1- point-next))
- t)))))
+ t))))))
;;;###autoload (autoload 'evil-numbers/dec-at-pt "evil-numbers" nil t)
(evil-define-operator evil-numbers/dec-at-pt
- [nongnu] elpa/evil-numbers 0934e38a76 099/145: README: various minor updates, (continued)
- [nongnu] elpa/evil-numbers 0934e38a76 099/145: README: various minor updates, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 299e0418ca 093/145: Cleanup: remove duplicate number search logic, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 445943fbce 082/145: Fix #17 bin/octal/hex numbers don't support becoming negative, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 79daec88d5 110/145: Cleanup: sort code into sections, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers b88595d46b 112/145: Cleanup: reduce vertical space use, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers a427fda95e 111/145: Update README.org, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers a01fa6b83a 106/145: Rename evil-numbers/padDefault to evil-numbers-pad-default, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 01c68921b5 114/145: README.org: update keymap examples, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 8d84bd3763 108/145: Cleanup: remove strict number searching logic, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers a65dbc5094 123/145: Cleanup: remove nil for empty body, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers bce451b700 137/145: Use message instead of error when no number is found,
ELPA Syncer <=
- [nongnu] elpa/evil-numbers 6087ef48b9 140/145: Tests: run increment operations at different offsets, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 8ce0066fa4 143/145: Tests: rename evil-numbers-test.el to evil-numbers-tests.el, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers d7a3e6ddec 129/145: Add evil to requirements, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 11883bc3a3 124/145: Fix incremental regression in cleanup from 7602f3b4842f4ec149d3b8ed32c9da9f771597c3, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers f48504348f 121/145: Add evil-numbers-case option, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 6ff686be13 120/145: Cleanup: remove autoload on defcustom, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 9423e4cb8f 142/145: Tests: add simple-hex-negative-to-positive, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 8761f55167 144/145: Cleanup: redundant group usage, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers 061de6f895 139/145: Tests: watch evil-numbers.el as well as the tests, ELPA Syncer, 2022/01/06
- [nongnu] elpa/evil-numbers b2e8ac003f 023/145: Fix install documentation., ELPA Syncer, 2022/01/06