aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Fürmetz <fuermetz@mailbox.org>2019-07-31 15:48:20 +0200
committerLukas Fürmetz <fuermetz@mailbox.org>2019-07-31 15:48:20 +0200
commiteceae190ec3aef6a97fc5daed49c6016daf457f2 (patch)
treee778327a32210a38b5ea59183da00909ffca54bf
parent0632e6874252aad7501aeba86c9d3b80ab7938c2 (diff)
Revert "Add support for backtab"
This reverts commit ecd362b5d92f62626b18258eeef2b2a04706c86e. This breaks C-a, C-e, ...
-rw-r--r--vterm-module.c2
-rw-r--r--vterm.el14
2 files changed, 3 insertions, 13 deletions
diff --git a/vterm-module.c b/vterm-module.c
index edf8237..bf9483c 100644
--- a/vterm-module.c
+++ b/vterm-module.c
@@ -546,8 +546,6 @@ static void term_process_key(Term *term, unsigned char *key, size_t len,
vterm_keyboard_end_paste(term->vt);
} else if (is_key(key, len, "<tab>")) {
vterm_keyboard_key(term->vt, VTERM_KEY_TAB, modifier);
- } else if (is_key(key, len, "<backtab>") || is_key(key, len, "<iso-lefttab>")) {
- vterm_keyboard_key(term->vt, VTERM_KEY_TAB, VTERM_MOD_SHIFT);
} else if (is_key(key, len, "<backspace>")) {
vterm_keyboard_key(term->vt, VTERM_KEY_BACKSPACE, modifier);
} else if (is_key(key, len, "<escape>")) {
diff --git a/vterm.el b/vterm.el
index 0f391be..51e9ee9 100644
--- a/vterm.el
+++ b/vterm.el
@@ -244,7 +244,6 @@ If nil, never delay")
;; Keybindings
(define-key vterm-mode-map [tab] #'vterm--self-insert)
-(define-key vterm-mode-map [backtab] #'vterm--self-insert)
(define-key vterm-mode-map [backspace] #'vterm--self-insert)
(define-key vterm-mode-map [M-backspace] #'vterm--self-insert)
(define-key vterm-mode-map [return] #'vterm--self-insert)
@@ -276,15 +275,6 @@ If nil, never delay")
unless (member key vterm-keymap-exceptions)
collect key))))
-(defun vterm-event-basic-type (event)
- "Same as `event-basic-type', except the downcasing of EVENT."
- (if (consp event)
- (setq event (car event)))
- (if (symbolp event)
- (car (get event 'event-symbol-elements))
- (let* ((base (logand event (1- ?\A-\^@))))
- (if (< base 32) (logior base 64) base))))
-
(defun vterm--self-insert ()
"Sends invoking key to libvterm."
(interactive)
@@ -293,7 +283,7 @@ If nil, never delay")
(shift (memq 'shift modifiers))
(meta (memq 'meta modifiers))
(ctrl (memq 'control modifiers)))
- (when-let ((key (key-description (vector (vterm-event-basic-type last-input-event)))))
+ (when-let ((key (key-description (vector (event-basic-type last-input-event)))))
(vterm-send-key key shift meta ctrl)))))
(defun vterm-send-key (key &optional shift meta ctrl)
@@ -301,6 +291,8 @@ If nil, never delay")
(when vterm--term
(let ((inhibit-redisplay t)
(inhibit-read-only t))
+ (when (and shift (not meta) (not ctrl))
+ (setq key (upcase key)))
(vterm--update vterm--term key shift meta ctrl))))
(defun vterm-send-ctrl-c ()