xserver: Branch 'master'

[Adam Jackson]

 hw/kdrive/src/kinput.c         |    2 +-
 hw/xfree86/common/xf86Config.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 42e7b64bf90604e0099702f5447163be80a2efb6
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 7 20:32:02 2008 -0400

    -retro enables zapping

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index fcd94e2..8a1380f 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -1925,7 +1925,7 @@ KdCheckSpecialKeys(KdKeyboardInfo *ki, int type, int sym)
 	 * Set the dispatch exception flag so the server will terminate the
 	 * next time through the dispatch loop.
 	 */
-	if (kdAllowZap)
+	if (kdAllowZap || party_like_its_1989)
 	    dispatchException |= DE_TERMINATE;
 	break;
     }
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 8c958b4..45e776f 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -876,6 +876,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
     xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
     xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
     xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+    xf86Info.dontZap |= party_like_its_1989;
     xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
 
     xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);