[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/paredit 460254d 162/224: Fix paredit-doublequote inside a
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/paredit 460254d 162/224: Fix paredit-doublequote inside a string escape. |
Date: |
Sat, 7 Aug 2021 09:22:41 -0400 (EDT) |
branch: elpa/paredit
commit 460254d20624057f8ededfeb822891492c908c66
Author: Taylor R Campbell <campbell@mumble.net>
Commit: Taylor R Campbell <campbell@mumble.net>
Fix paredit-doublequote inside a string escape.
---
paredit.el | 9 +++++----
test.el | 3 +++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/paredit.el b/paredit.el
index 3ad7f72..fcf50b7 100644
--- a/paredit.el
+++ b/paredit.el
@@ -875,10 +875,11 @@ If in a character literal, do nothing. This prevents
accidentally
delimiter unintentionally."
(interactive "P")
(cond ((paredit-in-string-p)
- (if (eq (cdr (paredit-string-start+end-points))
- (point))
- (forward-char) ; We're on the closing quote.
- (insert ?\\ ?\" )))
+ (if (eq (point) (- (paredit-enclosing-string-end) 1))
+ (forward-char) ; Just move past the closing quote.
+ ;; Don't split a \x into an escaped backslash and a string end.
+ (if (paredit-in-string-escape-p) (forward-char))
+ (insert ?\\ ?\" )))
((paredit-in-comment-p)
(insert ?\" ))
((not (paredit-in-char-p))
diff --git a/test.el b/test.el
index 7d12283..ba71788 100644
--- a/test.el
+++ b/test.el
@@ -234,6 +234,9 @@ Four arguments: the paredit command, the text of the buffer
;; `comment-search-forward' to wind up inside a character or a
;; string?
))
+
+(paredit-test 'paredit-doublequote
+ '(("\"foo \\|x bar\"" "\"foo \\x\\\"| bar\"")))
(paredit-test 'paredit-forward-delete
'(("f|oo" "f|o")
- [nongnu] elpa/paredit 5558fd0 137/224: Make `paredit-in-char-p' work recursively., (continued)
- [nongnu] elpa/paredit 5558fd0 137/224: Make `paredit-in-char-p' work recursively., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 88a5cf7 139/224: Be explicit about Transient Mark Mode in `paredit-wrap-*' tests., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit d80a9db 141/224: Fail early in `paredit-convolute-sexp'., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 2ec6000 145/224: Fix error message in `paredit-test'., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 6f2677b 148/224: Tweak `paredit-convolute-sexp' a little and add some tests for it., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit d54ea28 149/224: Add a trivial shell script to generate paredit.html., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 540bc9c 153/224: Remove unnecessarily nasty text about reporting bugs., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit b02f509 156/224: New file NEWS from paredit.release., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit b647a1a 158/224: Bump copyright year on test.el to 2013., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit f25cd3b 159/224: Add a zillion paredit-kill tests. Fix a tiny bug they revealed., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 460254d 162/224: Fix paredit-doublequote inside a string escape.,
ELPA Syncer <=
- [nongnu] elpa/paredit db82936 163/224: Make `paredit-forward' and `paredit-backward' move out of strings., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 18cf19f 164/224: Implement `paredit-preserving-column'., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 5840f55 165/224: Preserve column better in `paredit-join'., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 9838fe2 174/224: In check.sh, use $EMACS if set, defaulting to `emacs'., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 3bdd840 175/224: Rework paredit-semicolon and add some tests for it., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 014cdfe 177/224: Handle shift selection in motion commands in recent GNU Emacs., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit be28e85 178/224: Mention shift selection for motion commands in NEWS., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 42a0494 179/224: Use $EMACS in genhtml.sh too., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit 856d927 180/224: Use `paredit-preserving-column' in `paredit-reindent-defun'., ELPA Syncer, 2021/08/07
- [nongnu] elpa/paredit a26c148 182/224: Bind M-[ to paredit-wrap-square., ELPA Syncer, 2021/08/07