Mercurial > hg > xemacs-beta
changeset 4364:d74913294e87
Automated merge with file:/Sources/xemacs-21.5-checked-out
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Thu, 27 Dec 2007 13:21:05 +0100 |
| parents | 6a17ac5da3c4 (current diff) b545430be2eb (diff) |
| children | c9ab656691c0 |
| files | |
| diffstat | 4 files changed, 26 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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-26 Stephen J. Turnbull <stephen@xemacs.org> + + * Makefile.in.in (check-available-packages): Say where to install. + 2007-12-23 Stephen J. Turnbull <stephen@xemacs.org> * Makefile.in.in (mkpkgdir):
--- 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 @@ 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;
--- 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@parhasard.net> + + * 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@parhasard.net> * symbols.c (Fintern_soft):
--- 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 @@ 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