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

Merge remote-tracking branch 'origin/master' into feature/android

Browse source
This commit is contained in:
Po Lu 2023-06-19 08:55:42 +08:00
commit 83eeebe9ef
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/term.el
View file

@ -948,6 +948,9 @@ underlying shell."
(define-key map [next] 'term-send-next)
(define-key map [xterm-paste] #'term--xterm-paste)
(define-key map [?\C-/] #'term-send-C-_)
(define-key map [?\C- ] #'term-send-C-@)
(define-key map [?\C-\M-/] #'term-send-C-M-_)
(define-key map [?\C-\M- ] #'term-send-C-M-@)
(when term-bind-function-keys
(dotimes (key 21)
@ -1414,6 +1417,9 @@ Entry to this mode runs the hooks on `term-mode-hook'."
(defun term-send-del () (interactive) (term-send-raw-string "\e[3~"))
(defun term-send-backspace () (interactive) (term-send-raw-string "\C-?"))
(defun term-send-C-_ () (interactive) (term-send-raw-string "\C-_"))
(defun term-send-C-@ () (interactive) (term-send-raw-string "\C-@"))
(defun term-send-C-M-_ () (interactive) (term-send-raw-string "\e\C-_"))
(defun term-send-C-M-@ () (interactive) (term-send-raw-string "\e\C-@"))
(defun term-send-function-key ()
"If bound to a function key, this will send that key to the underlying shell."

10
test/lisp/eshell/esh-util-tests.el
View file

@ -46,9 +46,15 @@
(ert-deftest esh-util-test/eshell-stringify/list ()
"Test that `eshell-stringify' correctly stringifies lists."
;; These tests depend on the particulars of how Emacs pretty-prints
;; lists; changes to the pretty-printer could result in different
;; whitespace. We don't care about that, except to ensure there's
;; no leading/trailing whitespace.
(should (equal (eshell-stringify '(1 2 3)) "(1 2 3)"))
(should (equal (eshell-stringify '((1 2) (3 . 4)))
"((1 2)\n (3 . 4))")))
(should (equal (replace-regexp-in-string
(rx (+ (or space "\n"))) " "
(eshell-stringify '((1 2) (3 . 4))))
"((1 2) (3 . 4))")))
(ert-deftest esh-util-test/eshell-stringify/complex ()
"Test that `eshell-stringify' correctly stringifies complex objects."