diff options
author | Glenn Morris <rgm@gnu.org> | 2019-06-07 07:50:49 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-06-07 07:50:49 -0700 |
commit | 348657cc2155f1d27338dc169634dc74caf9a0a3 (patch) | |
tree | 79725bbf23d87b76cf2ec9615f9e5b8ee52296ee /lisp/term/w32-win.el | |
parent | 6bee17e4474cce4175f0289961f1f1fc40ba800e (diff) | |
parent | 9254885a9571162920889f47adb41eaf1e555c21 (diff) | |
download | emacs-348657cc2155f1d27338dc169634dc74caf9a0a3.tar.gz |
Merge from origin/emacs-26
9254885 (origin/emacs-26) Resurrect display-line-number-mode in clien...
aecbbd5 * src/fns.c (Fmapconcat): Doc fix. (Bug#35710)
8e5fc38 Fix typo
ee21b40 * lisp/term/w32-win.el ([noname]): Bind to 'ignore'. (Bug#36...
f68b33f Fix styling of Unicode codepoints in manuals
ff7ec6f Fix a few uses of quotes in user manual
b67042b More minor copyedits in the Emacs manual
9734b5c Fix minor issues in the Emacs manual
c153250 Try to improve text on atomic windows in Elisp manual
fb314ba Don't recommend insert-before-markers in process filters
Diffstat (limited to 'lisp/term/w32-win.el')
-rw-r--r-- | lisp/term/w32-win.el | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index beb7425ce55..044b82ed1e0 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -170,6 +170,15 @@ the last file dropped is selected." ;; new layout/language selected by the user. (global-set-key [language-change] 'ignore) +;; Some Windows applications send the 'noname' (VK_NONAME) pseudo-key +;; to prevent Windows from sleeping. We want to ignore these key +;; events, to avoid annoying users by ringing the bell and announcing +;; that the key is not bound. +(global-set-key [noname] 'ignore) +(global-set-key [C-noname] 'ignore) +(global-set-key [M-noname] 'ignore) + + (defvar x-resource-name) |