From: tomo Date: Wed, 15 Aug 2001 05:42:03 +0000 (+0000) Subject: Sync up with r21-2-40. X-Git-Tag: r21-2-40-utf-2000-0_17-1~2 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a6e504d0d9e2bc8b1af186952cc1153638f4d539;p=chise%2Fxemacs-chise.git- Sync up with r21-2-40. --- diff --git a/CHANGES-beta b/CHANGES-beta index e88c85d..baaf16c 100644 --- a/CHANGES-beta +++ b/CHANGES-beta @@ -1,3 +1,12 @@ +to 21.2.40 "Persephone" +-- various doc fixes -- Stephen Turnbull +-- more widget bug fixes -- Andy Piper +-- Introduce yet another hash table weakness type -- Andy Piper +-- SCO 5 fixes -- Golubev I. N. +-- SunOS 4 works again -- MIYASHITA Hisashi +-- Make peace with Mandrake's Alt-Meta hacks -- Stephen Turnbull +-- Remove input-method-xfs.o -- Kazuyuki IENAGA + to 21.2.39 "Millennium" -- Safer coding-priority-list -- Stephen Turnbull -- Andreas Jaeger resigns as core maintainer :-( diff --git a/ChangeLog b/ChangeLog index f59d25e..870bb62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,26 @@ * configure.in: Add new option `--with-utf-2000'; define `UTF2000' if it is specified. +2001-01-08 Martin Buchholz + + * XEmacs 21.2.40 is released. + +2000-12-26 Stephen J. Turnbull + + * PROBLEMS (Running/Linux): Rehabilitate Mandrake; tip for color-gcc. + +2000-12-20 Stephen J. Turnbull + + * PROBLEMS (Linux): document Mandrake policy, how to get Meta on + Alt, and getaddrinfo() blocking trying to get localhost's CNAME. + +2000-07-20 Kazuyuki IENAGA + + * configure.in: use input-method-xlib.o for USE_XFONTSET instead + of input-method-xfs.o. + + * configure: ditto + 2000-12-31 Martin Buchholz * XEmacs 21.2.39 is released. diff --git a/PROBLEMS b/PROBLEMS index bb1f8cd..7610939 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -1258,19 +1258,23 @@ affected virtually all ioctl() calls. ** Linux -*** Mandrake (all versions) +*** Mandrake -Cannot be fully supported by XEmacs developers because they insist on -applying known broken patches. +The Mandrake Linux distribution is attempting to comprehensively +update the user interface, and make it consistent across +applications. This is very difficult, and will occasionally cause +conflicts with applications like Emacs with their own long-established +interfaces. Known issues specific to Mandrake or especially common: -One known issue is that on keyboards with both a Meta key (typically -the Windows key on PCs) and an Alt key, XEmacs wants to bind the Meta -modifier to the Meta key. Mandrake has a policy that XEmacs -Meta-chords should use the Alt key, which they enforce by patching -XEmacs's modifier-handling code, making the Meta and Alt modifiers -synonymous. This will break planned upgrades to XEmacs to allow menu -hotkeys; be warned. See next topic for how to implement Meta-on-Alt -portably. +Some versions of XEmacs (21.1.9 is known) distributed with Mandrake +were patched to make the Meta and Alt keysyms synonymous. These +normally work as expected in the Mandrake environment. However, +custom-built XEmacsen (including all 21.2 betas) will "inexplicably" +not respect the "Alt-invokes-Meta-commands" convention. See "I want +XEmacs to use the Alt key" below. + +The color-gcc wrapper (see below) is in common use on the Mandrake +platform. *** I want XEmacs to use the Alt key, not the XXX key, for Meta commands @@ -1284,12 +1288,35 @@ the window manager. One correct way to implement this was suggested on comp.emacs.xemacs (by Kilian Foth and in more detail by Michael Piotrowski): unmap the Meta modifier using xmodmap or xkb, and then map the Meta/Windows key -to the Super or Hyper modifier. XEmacs will not find the Meta keysym, -and default to using the Alt key for Meta keybindings. Typically few -applications use the (X11) Meta modifier (sawfish is one); it is -tedious but not too much so to teach them to use Super instead of -Meta. There may be further useful hints in the discussion of -keymapping on non-Linux platforms. +to the Super or Hyper keysym and an appropriate mod bit. XEmacs will +not find the Meta keysym, and default to using the Alt key for Meta +keybindings. Typically few applications use the (X11) Meta modifier; +it is tedious but not too much so to teach the ones you need to use +Super instead of Meta. There may be further useful hints in the +discussion of keymapping on non-Linux platforms. + +*** The color-gcc wrapper + +This wrapper colorizes the error messages from gcc. By default XEmacs +does not interpret the escape sequences used to generate colors, +resulting in a cluttered, hard-to-read buffer. You can remove the +wrapper, or defeat the wrapper colorization in Emacs process buffers +by editing the "nocolor" attribute in /etc/colorgccrc: + +$ diff -u /etc/colorgccrc.old /etc/colorgccrc +--- /etc/colorgccrc.old Tue Dec 26 02:17:46 2000 ++++ /etc/colorgccrc Tue Dec 26 02:15:48 2000 +@@ -34,1 +34,1 @@ +-nocolor: dumb ++nocolor: dumb emacs + +If you want colorization in your Emacs buffers, you may get good +results from the ansi-color.el library: + +http://www.geocities.com/kensanata/color-emacs.html#ansicolors + +This is written for the mainline GNU Emacs but the author has made +efforts to adapt it to XEmacs. YMMV. *** You get crashes in a non-C locale with Linux GNU Libc 2.0. diff --git a/configure b/configure index d786d4e..0a65c01 100755 --- a/configure +++ b/configure @@ -9526,8 +9526,8 @@ EOF } if test "$with_xim" = "no" ; then - extra_objs="$extra_objs input-method-xfs.o" && if test "$extra_verbose" = "yes"; then - echo " xemacs will be linked with \"input-method-xfs.o\"" + extra_objs="$extra_objs input-method-xlib.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"input-method-xlib.o\"" fi fi fi diff --git a/configure.in b/configure.in index 5dc9073..d2ce200 100644 --- a/configure.in +++ b/configure.in @@ -3500,7 +3500,7 @@ if test "$with_mule" = "yes" ; then if test "$with_xfs" = "yes" && test "$with_menubars" = "lucid"; then AC_DEFINE(USE_XFONTSET) if test "$with_xim" = "no" ; then - XE_ADD_OBJS(input-method-xfs.o) + XE_ADD_OBJS(input-method-xlib.o) fi fi fi dnl with_xfs diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog index 8e2dad2..45de799 100644 --- a/netinstall/ChangeLog +++ b/netinstall/ChangeLog @@ -1,3 +1,7 @@ +2001-01-08 Martin Buchholz + + * XEmacs 21.2.40 is released. + 2000-12-31 Martin Buchholz * XEmacs 21.2.39 is released. @@ -124,5 +128,5 @@ * all: port from cygwin setup. -%%% $Id: ChangeLog,v 1.1.2.4 2000/12/30 10:01:41 andyp Exp $ -$Revision: 1.1.2.4 $ +%%% $Id: ChangeLog,v 1.1.2.5 2000/12/31 12:03:34 martinb Exp $ +$Revision: 1.1.2.5 $ diff --git a/version.sh b/version.sh index 8fa04f0..503b883 100644 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ emacs_is_beta=t emacs_major_version=21 emacs_minor_version=2 -emacs_beta_version=39 -xemacs_codename="Millennium" +emacs_beta_version=40 +xemacs_codename="Persephone" infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8