From: Daniel Colascione <dancol@dancol.org>
Date: Mon, 30 Dec 2013 23:27:07 +0000 (-0800)
Subject: Ignore XF86WakeUp
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9e0bf19a5c222ce74c110180ac3c1beacecd2122;p=emacs.git

Ignore XF86WakeUp
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30634f79b14..67774ed6b70 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 3c7373b6d65..424203c5c1d 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