From 2dd7218dfa491cec282c193cdfe6db573310d202 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Sat, 15 Jul 2000 08:14:12 +0000
Subject: [PATCH] WMRootMenu is now plmenu instead of a text menu

---
 WindowMaker/Defaults/Makefile.am    | 5 ++++-
 WindowMaker/Defaults/WMGLOBAL       | 2 +-
 WindowMaker/Defaults/WMRootMenu     | 2 --
 WindowMaker/Defaults/WindowMaker.in | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100755 WindowMaker/Defaults/WMRootMenu

diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am
index 1f4023c4..04511643 100644
--- a/WindowMaker/Defaults/Makefile.am
+++ b/WindowMaker/Defaults/Makefile.am
@@ -3,7 +3,7 @@ defsdatadir = $(sysconfdir)/WindowMaker
 
 defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
 
-EXTRA_DIST = WMRootMenu WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
+EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in
 
 CLEANFILES = WMWindowAttributes WindowMaker WMState
 
@@ -24,3 +24,6 @@ WMState: $(srcdir)/WMState.in
 	sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState
 	chmod 644 WMState
 
+WMRootMenu: $(srcdir)/../plmenu
+	-cp -f ../plmenu WMRootMenu
+
diff --git a/WindowMaker/Defaults/WMGLOBAL b/WindowMaker/Defaults/WMGLOBAL
index 834e8834..b9d436f2 100644
--- a/WindowMaker/Defaults/WMGLOBAL
+++ b/WindowMaker/Defaults/WMGLOBAL
@@ -2,7 +2,7 @@
   SystemFont = "-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*";
   BoldSystemFont = "-*-helvetica-bold-r-normal-*-%d-*-*-*-*-*-*-*";
   FloppyPath = "/floppy";
-  MultiByteText = NO;
+  MultiByteText = AUTO;
   DoubleClickTime = 250;
   MouseWheelUp = Button4;
   MouseWheelDown = Button5;
diff --git a/WindowMaker/Defaults/WMRootMenu b/WindowMaker/Defaults/WMRootMenu
deleted file mode 100755
index 3e537981..00000000
--- a/WindowMaker/Defaults/WMRootMenu
+++ /dev/null
@@ -1,2 +0,0 @@
-"~/GNUstep/Library/WindowMaker/menu"
-
diff --git a/WindowMaker/Defaults/WindowMaker.in b/WindowMaker/Defaults/WindowMaker.in
index 31e05be2..ced3a17c 100644
--- a/WindowMaker/Defaults/WindowMaker.in
+++ b/WindowMaker/Defaults/WindowMaker.in
@@ -1,5 +1,4 @@
 {
-  MultiByteText = NO;
   SmoothWorkspaceBack = NO;
   WindozeCycling = YES;
   PopupSwitchMenu = NO;