procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of '\\' inside double-quotes in Eshell

Browse source 
Previously, Eshell would get confused and think the following command
was unterminated due to the second double-quote looking like it was
escaped:

  echo "\\"

* lisp/eshell/esh-util.el (eshell-find-delimiter): Correct docstring
and treat '\' as an escapeable character when using backslash escapes.

* test/lisp/eshell/eshell-tests.el
(eshell-test/escape-special-quoted): Adapt test.
This commit is contained in:
Jim Porter 2022-03-27 12:09:58 -07:00 • committed by Lars Ingebrigtsen
parent 9f521db6fe
commit c12a48c335
2 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

51
lisp/eshell/esh-util.el
View file

@ -151,49 +151,52 @@ Otherwise, evaluates FORM with no error handling."
(defun eshell-find-delimiter
(open close &optional bound reverse-p backslash-p)
"From point, find the CLOSE delimiter corresponding to OPEN.
The matching is bounded by BOUND.
If REVERSE-P is non-nil, process the region backwards.
If BACKSLASH-P is non-nil, and OPEN and CLOSE are the same character,
then quoting is done by a backslash, rather than a doubled delimiter."
The matching is bounded by BOUND. If REVERSE-P is non-nil,
process the region backwards.
If BACKSLASH-P is non-nil, or OPEN and CLOSE are different
characters, then a backslash can be used to escape a delimiter
(or another backslash). Otherwise, the delimiter is escaped by
doubling it up."
(save-excursion
(let ((depth 1)
(bound (or bound (point-max))))
(if (if reverse-p
(eq (char-before) close)
(eq (char-after) open))
(forward-char (if reverse-p -1 1)))
(when (if reverse-p
(eq (char-before) close)
(eq (char-after) open))
(forward-char (if reverse-p -1 1)))
(while (and (> depth 0)
(funcall (if reverse-p '> '<) (point) bound))
(let ((c (if reverse-p (char-before) (char-after))) nc)
(funcall (if reverse-p #'> #'<) (point) bound))
(let ((c (if reverse-p (char-before) (char-after))))
(cond ((and (not reverse-p)
(or (not (eq open close))
backslash-p)
(eq c ?\\)
(setq nc (char-after (1+ (point))))
(or (eq nc open) (eq nc close)))
(memq (char-after (1+ (point)))
(list open close ?\\)))
(forward-char 1))
((and reverse-p
(or (not (eq open close))
backslash-p)
(or (eq c open) (eq c close))
(eq (char-before (1- (point)))
?\\))
(eq (char-before (1- (point))) ?\\)
(memq c (list open close ?\\)))
(forward-char -1))
((eq open close)
(if (eq c open)
(if (and (not backslash-p)
(eq (if reverse-p
(char-before (1- (point)))
(char-after (1+ (point)))) open))
(forward-char (if reverse-p -1 1))
(setq depth (1- depth)))))
(when (eq c open)
(if (and (not backslash-p)
(eq (if reverse-p
(char-before (1- (point)))
(char-after (1+ (point))))
open))
(forward-char (if reverse-p -1 1))
(setq depth (1- depth)))))
((= c open)
(setq depth (+ depth (if reverse-p -1 1))))
((= c close)
(setq depth (+ depth (if reverse-p 1 -1))))))
(forward-char (if reverse-p -1 1)))
(if (= depth 0)
(if reverse-p (point) (1- (point)))))))
(when (= depth 0)
(if reverse-p (point) (1- (point)))))))
(defun eshell-convert (string)
"Convert STRING into a more native looking Lisp object."

4
test/lisp/eshell/eshell-tests.el
View file

@ -148,9 +148,9 @@ chars"
"Test that the backslash is not preserved for escaped special
chars"
(with-temp-eshell
(eshell-command-result-p "echo \"h\\\\i\""
(eshell-command-result-p "echo \"\\\"hi\\\\\""
;; Backslashes are doubled for regexp.
"h\\\\i\n")))
"\\\"hi\\\\\n")))
(ert-deftest eshell-test/command-running-p ()
"Modeline should show no command running"