Fri Dec 29 14:39:09 PST 2000 Michael Jennings <mej@eterm.org>

	Moved the HAVE_SAVED_UIDS define into a configure option so that the
	FreeBSD folks will have an easier time with it.

	Fixed "make distcheck" which broke at some point.

	That X stuff in clean_exit() should only happen if we're debugging.
	Nobody but me should have to deal with those random hangs. :-)

	Added a patch for multibyte cursor support from Michael C. Wu
	<keichii@iteration.net> and Sung-Hyun Nam <namsh@lgic.co.kr>, along
	with some other FreeBSD-related patches from Mr. Wu.


SVN revision: 4065

9 files changed, 65 insertions, 64 deletions

diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index 9313929..9f52a6c 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -90,14 +90,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 00804b8..3fab2d6 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -23,6 +23,7 @@ install-data-hook:
 	    $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/themes/$$i ; \
 	    $(CHMOD) 644 $(DESTDIR)$(pkgdatadir)/themes/$$i/???* ; \
 	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in ; \
+	    rm -f $(DESTDIR)$(pkgdatadir)/themes/$$i/theme.cfg.in.orig ; \
 	  else \
 	    echo "ALERT!  Not overwriting $$i theme in $(DESTDIR)$(pkgdatadir)/themes.  You will need to update this theme manually." ; \
 	  fi ; \
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index ec5f1c2..9bf58b2 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -90,14 +90,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
index e963c47..230ba64 100644
--- a/themes/cEterm/theme.cfg.in
+++ b/themes/cEterm/theme.cfg.in
@@ -89,14 +89,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 9ed3758..2fdea5e 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -90,14 +90,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index 5fc3bec..b7d2e76 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -90,14 +90,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index edda17d..1e67561 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -92,14 +92,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index 3a6c1df..4d6683c 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -90,14 +90,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index d00d985..09baad2 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -90,14 +90,14 @@ begin main
 # The Multichar support options.  Same goes for these fonts as for the normal
 # ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
 # or big5 or gb
-#  begin multichar
-#    font 0 @MFONT0@
-#    font 1 @MFONT1@
-#    font 2 @MFONT2@
-#    font 3 @MFONT3@
-#    font 4 @MFONT4@
-#    encoding @MULTICHAR_ENCODING@
-#  end multichar
+  begin multichar
+    font 0 @MFONT0@
+    font 1 @MFONT1@
+    font 2 @MFONT2@
+    font 3 @MFONT3@
+    font 4 @MFONT4@
+    encoding @MULTICHAR_ENCODING@
+  end multichar
 
 # Define the imageclasses.
   begin imageclasses