diff options
| author | Daniel Colascione <dancol@dancol.org> | 2013-12-30 15:27:07 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2013-12-30 15:27:07 -0800 |
| commit | 9e0bf19a5c222ce74c110180ac3c1beacecd2122 (patch) | |
| tree | 5f0b9e78a410b634b75e667b72460e882572f04b | |
| parent | e63ace374ce30dbc4660edc696596d116ce9f3f2 (diff) | |
Ignore XF86WakeUp
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 30634f79b1..67774ed6b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-12-30 Daniel Colascione <dancol@dancol.org> + * term/x-win.el ([XF86WakeUp]): Ignore the XF86WakeUp key instead + of printing a useless when we resume from sleep. + * progmodes/sh-script.el (sh-smie-sh-forward-token,sh-smie-rc-forward-token): Fix infloop in indentation code. (Bug#16233) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 3c7373b6d6..424203c5c1 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1595,6 +1595,8 @@ This uses `icon-map-list' to map icon file names to stock icon names." (and value (cdr value)))) x-gtk-stock-cache)))) +(global-set-key [XF86WakeUp] 'ignore) + (provide 'x-win) ;;; x-win.el ends here |