commit: Automated merge with file:/Sources/xemacs-21.5-checked-out

changeset: 4364:d74913294e8794f2d973faf8af11028702444873 parent: 4363:6a17ac5da3c4d311bec3618f02b531b0a0467e4b parent: 4360:b545430be2eb1d007008624cb1bce9d4eea9efff user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Thu Dec 27 13:21:05 2007 +0100 files: description: Automated merge with file:/Sources/xemacs-21.5-checked-out diff -r 6a17ac5da3c4d311bec3618f02b531b0a0467e4b -r d74913294e8794f2d973faf8af11028702444873 ChangeLog --- a/ChangeLog Tue Dec 25 14:19:45 2007 +0100 +++ b/ChangeLog Thu Dec 27 13:21:05 2007 +0100 ＠＠ -1,3 +1,7 ＠＠ 2007-12-23 Stephen J. Turnbull <stephe +2007-12-26 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * Makefile.in.in (check-available-packages): Say where to install. + 2007-12-23 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * Makefile.in.in (mkpkgdir): diff -r 6a17ac5da3c4d311bec3618f02b531b0a0467e4b -r d74913294e8794f2d973faf8af11028702444873 Makefile.in.in --- a/Makefile.in.in Tue Dec 25 14:19:45 2007 +0100 +++ b/Makefile.in.in Thu Dec 27 13:21:05 2007 +0100 ＠＠ -500,15 +500,18 ＠＠ pkgsrcdir = ${srcdir}/etc/bundled-packag check-available-packages: ＠if test -r ${pkgsrcdir}/bootstrap.tar.gz; \ - then echo "To install a set of bootstrap packages, type:"; \ + then echo "To install a set of bootstrap packages in"; \ + echo "${package_path}/xemacs-packages, type:"; \ echo " make install-bootstrap-packages"; \ fi; \ if test -r ${pkgsrcdir}/xemacs-sumo.tar.gz; \ - then echo "To install the full set of non-mule packages, type:"; \ + then echo "To install the full set of non-mule packages in"; \ + echo "${package_path}/xemacs-packages, type:"; \ echo " make install-nonmule-packages"; \ fi; \ if test -r ${pkgsrcdir}/xemacs-mule-sumo.tar.gz; \ - then echo "To install the full set of packages with mule, type:"; \ + then echo "To install the full set of packages with mule in"; \ + echo "${package_path}/mule-packages, type:"; \ echo " make install-all-packages"; \ fi; diff -r 6a17ac5da3c4d311bec3618f02b531b0a0467e4b -r d74913294e8794f2d973faf8af11028702444873 src/ChangeLog --- a/src/ChangeLog Tue Dec 25 14:19:45 2007 +0100 +++ b/src/ChangeLog Thu Dec 27 13:21:05 2007 +0100 ＠＠ -1,3 +1,10 ＠＠ 2007-12-24 Aidan Kehoe <kehoea＠parhasa +2007-12-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * event-xlike-inc.c (x_keysym_to_character): + * event-xlike-inc.c (gtk_keysym_to_character): + Unify the typed character if possible, following the current value + for the unicode precedence list. + 2007-12-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * symbols.c (Fintern_soft): diff -r 6a17ac5da3c4d311bec3618f02b531b0a0467e4b -r d74913294e8794f2d973faf8af11028702444873 src/event-xlike-inc.c --- a/src/event-xlike-inc.c Tue Dec 25 14:19:45 2007 +0100 +++ b/src/event-xlike-inc.c Thu Dec 27 13:21:05 2007 +0100 ＠＠ -708,7 +708,15 ＠＠ gtk_keysym_to_character(guint keysym) return Qnil; #ifdef MULE - return make_char (make_ichar (charset, code, 0)); + { + Lisp_Object unified = Funicode_to_char + (Fchar_to_unicode (make_char (make_ichar (charset, code, 0))), Qnil); + if (!NILP (unified)) + { + return unified; + } + return make_char (make_ichar (charset, code, 0)); + } #else return make_char (code + 0x80); #endif _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches