[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/exwm b79a3c5 4/4: Merge branch 'Stebalien/expose-line-m
From: |
Chris Feng |
Subject: |
[elpa] externals/exwm b79a3c5 4/4: Merge branch 'Stebalien/expose-line-mode-passthrough' into externals/exwm |
Date: |
Fri, 24 Feb 2017 10:31:54 -0500 (EST) |
branch: externals/exwm
commit b79a3c52a5ebd2a663e47fe6d473400cf38bdcf4
Merge: f299ca5 d0e9895
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>
Merge branch 'Stebalien/expose-line-mode-passthrough' into externals/exwm
---
exwm-core.el | 4 ++--
exwm-input.el | 23 +++++++++++------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/exwm-core.el b/exwm-core.el
index c5f28cb..750f134 100644
--- a/exwm-core.el
+++ b/exwm-core.el
@@ -80,7 +80,7 @@
(logior xcb:EventMask:StructureNotify xcb:EventMask:PropertyChange))
"Event mask set on all managed windows.")
-(defvar exwm-input--line-mode-passthrough)
+(defvar exwm-input-line-mode-passthrough)
(defvar exwm-input--global-prefix-keys)
(defvar exwm-input-prefix-keys)
(defvar exwm-input--simulation-prefix-keys)
@@ -154,7 +154,7 @@
(lambda ()
(interactive)
(cond
- ((or exwm-input--line-mode-passthrough
+ ((or exwm-input-line-mode-passthrough
;; Do not test `exwm-input--during-command'.
(active-minibuffer-window)
(memq last-input-event exwm-input--global-prefix-keys)
diff --git a/exwm-input.el b/exwm-input.el
index d410bec..809f41e 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -420,7 +420,7 @@ This value should always be overwritten.")
(defvar exwm-input--during-command nil
"Indicate whether between `pre-command-hook' and `post-command-hook'.")
-(defvar exwm-input--line-mode-passthrough nil
+(defvar exwm-input-line-mode-passthrough nil
"Non-nil makes 'line-mode' forwards all events to Emacs.")
(defvar exwm-input--line-mode-cache nil "Cache for incomplete key sequence.")
@@ -449,7 +449,7 @@ This value should always be overwritten.")
(setq event (xcb:keysyms:keysym->event
exwm--connection (car keysym)
(logand state (lognot (cdr keysym)))))
- (or exwm-input--line-mode-passthrough
+ (or exwm-input-line-mode-passthrough
exwm-input--during-command
;; Forward the event when there is an incomplete key
;; sequence or when the minibuffer is active.
@@ -629,16 +629,15 @@ This value should always be overwritten.")
(let (key keys)
(dotimes (i times)
;; Skip events not from keyboard
- (setq exwm-input--line-mode-passthrough t)
- (catch 'break
- (while t
- (setq key (read-key (format "Send key: %s (%d/%d)"
- (key-description keys)
- (1+ i) times)))
- (when (and (listp key) (eq (car key) t))
- (setq key (cdr key)))
- (unless (listp key) (throw 'break nil))))
- (setq exwm-input--line-mode-passthrough nil)
+ (let ((exwm-input-line-mode-passthrough t))
+ (catch 'break
+ (while t
+ (setq key (read-key (format "Send key: %s (%d/%d)"
+ (key-description keys)
+ (1+ i) times)))
+ (when (and (listp key) (eq (car key) t))
+ (setq key (cdr key)))
+ (unless (listp key) (throw 'break nil)))))
(setq keys (vconcat keys (vector key)))
(exwm-input--fake-key key))))