[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/xelb 518b17a 16/42: Merge branch 'pipcet-no-num-lock'
From: |
Chris Feng |
Subject: |
[elpa] externals/xelb 518b17a 16/42: Merge branch 'pipcet-no-num-lock' |
Date: |
Thu, 17 Sep 2015 23:16:42 +0000 |
branch: externals/xelb
commit 518b17ab7af2131bb6c33a520f5792df1f08864c
Merge: 946d3ed bf39d9b
Author: Chris Feng <address@hidden>
Commit: Chris Feng <address@hidden>
Merge branch 'pipcet-no-num-lock'
---
xcb-keysyms.el | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xcb-keysyms.el b/xcb-keysyms.el
index c82f695..ce6e65b 100644
--- a/xcb-keysyms.el
+++ b/xcb-keysyms.el
@@ -100,6 +100,8 @@ This method must be called before using any other method in
this module."
xcb:ModMask:Control xcb:ModMask:1 xcb:ModMask:2
xcb:ModMask:3 xcb:ModMask:4 xcb:ModMask:5))
events keycode keysym)
+ (setq xcb:keysyms:mode-switch-mask nil
+ xcb:keysyms:num-lock-mask nil)
(cl-assert (= (length keycodes) (* 8 keycodes-per-modifier)))
(dotimes (i 8)
(setq events nil)
@@ -135,8 +137,8 @@ This method must be called before using any other method in
this module."
event)
(dolist (i (list xcb:ModMask:1 xcb:ModMask:2 xcb:ModMask:3
xcb:ModMask:4 xcb:ModMask:5))
- (unless (or (= i xcb:keysyms:mode-switch-mask) ;already determined
- (= i xcb:keysyms:num-lock-mask))
+ (unless (or (equal i xcb:keysyms:mode-switch-mask) ;already determined
+ (equal i xcb:keysyms:num-lock-mask))
(setf (slot-value key-press 'state) i
(slot-value fake-event 'event) (xcb:marshal key-press obj))
(run-with-idle-timer 0 nil (lambda ()
- [elpa] externals/xelb 87ebff4 06/42: Fix for 32bit platform, (continued)
- [elpa] externals/xelb 87ebff4 06/42: Fix for 32bit platform, Chris Feng, 2015/09/17
- [elpa] externals/xelb 1916894 07/42: Fix integer overflow on 32-bit platform, Chris Feng, 2015/09/17
- [elpa] externals/xelb c042d3f 08/42: Provide more verbose message when connection failed or auth required, Chris Feng, 2015/09/17
- [elpa] externals/xelb 6a7bccc 09/42: Disable concurrency of events, Chris Feng, 2015/09/17
- [elpa] externals/xelb 11005f2 10/42: Fix ch11ng/exwm#16 (cursor size not matching), Chris Feng, 2015/09/17
- [elpa] externals/xelb cd67b51 11/42: Set the `display` slot of `xcb:connection` in `xcb:connect-to-socket`, Chris Feng, 2015/09/17
- [elpa] externals/xelb 23cb30b 12/42: Fix an emacsclient bug, Chris Feng, 2015/09/17
- [elpa] externals/xelb 946d3ed 14/42: Fix keyboard mapping update problem, Chris Feng, 2015/09/17
- [elpa] externals/xelb 76246b4 13/42: Check `length` slot in `xcb:icccm:-GetProperty~reply`, Chris Feng, 2015/09/17
- [elpa] externals/xelb bf39d9b 15/42: allow key mappings without mode switch or NumLock keys, Chris Feng, 2015/09/17
- [elpa] externals/xelb 518b17a 16/42: Merge branch 'pipcet-no-num-lock',
Chris Feng <=
- [elpa] externals/xelb 4e42bf2 04/42: Cleanup code, Chris Feng, 2015/09/17
- [elpa] externals/xelb 1cea22d 20/42: Provide a way to disable auto-padding, Chris Feng, 2015/09/17
- [elpa] externals/xelb 247d6d2 17/42: Make the manipulation of message cache more robust, Chris Feng, 2015/09/17
- [elpa] externals/xelb 677623a 19/42: Disable auto-padding for xcb-xim, Chris Feng, 2015/09/17
- [elpa] externals/xelb 7c194e7 21/42: Don't assume key events are numbers; they can be symbols., Chris Feng, 2015/09/17
- [elpa] externals/xelb f465091 22/42: It's valid for WM_NORMAL_HINTS responses only to have 15 words., Chris Feng, 2015/09/17
- [elpa] externals/xelb aaddcd9 18/42: Add implicit paddings after variable-length <list>, Chris Feng, 2015/09/17
- [elpa] externals/xelb e153829 23/42: Merge pull request #2 from pipcet/shift-keypad-fix, Chris Feng, 2015/09/17
- [elpa] externals/xelb 520120a 24/42: Merge pull request #3 from pipcet/ignore-missing-values, Chris Feng, 2015/09/17
- [elpa] externals/xelb 1e20b20 26/42: Adjust to unmarshalling API changes., Chris Feng, 2015/09/17