Mercurial > hg > xemacs-beta
changeset 4563:b074f79040d1
Automated merge with file:///Sources/xemacs-21.5-checked-out
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:47:08 +0200 |
| parents | 86283c809984 (diff) 1c6cf8aa798b (current diff) |
| children | 46ddeaa7c738 |
| files | lisp/ChangeLog |
| diffstat | 4 files changed, 26 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 09 21:17:50 2008 +0200 +++ b/ChangeLog Wed Jul 09 20:47:08 2008 +0200 @@ -1,3 +1,9 @@ +2008-07-06 Ville Skyttä <scop@xemacs.org> + + * configure.ac (xe_fst): + New, to replace m4_fst which disappeared in autoconf 2.62 (#370). + (XE_EXPAND_COMPLEX_OPTIONS): Use xe_fst. + 2008-05-12 Michael Sperber <mike@xemacs.org> * configure.ac:
--- a/configure.ac Mon Jun 09 21:17:50 2008 +0200 +++ b/configure.ac Wed Jul 09 20:47:08 2008 +0200 @@ -387,9 +387,11 @@ dnl dnl Internal macro to recursively expand all the options in the option list. dnl +dnl m4_fst disappeared without a trace in autoconf 2.62 +m4_define([xe_fst], [$1])dnl define([XE_EXPAND_COMPLEX_OPTIONS], [m4_if([$2], [], [], - [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl + [XE_EXPAND_COMPLEX_OPTION([$1], xe_fst($2))[]dnl XE_EXPAND_COMPLEX_OPTIONS([$1], XE_CDR($2))])])dnl dnl dnl XE_INIT_COMPLEX_OPTION(prefix, option_list)
--- a/lisp/ChangeLog Mon Jun 09 21:17:50 2008 +0200 +++ b/lisp/ChangeLog Wed Jul 09 20:47:08 2008 +0200 @@ -1,3 +1,9 @@ +2008-06-29 Aidan Kehoe <kehoea@parhasard.net> + + * descr-text.el (describe-char-unicode-data): + Don't leak the Unihan database handle when looking up non-Han + characters. + 2008-06-04 Aidan Kehoe <kehoea@parhasard.net> * descr-text.el (describe-property-list):
--- a/lisp/descr-text.el Mon Jun 09 21:17:50 2008 +0200 +++ b/lisp/descr-text.el Wed Jul 09 20:47:08 2008 +0200 @@ -729,16 +729,7 @@ (goto-char (point-min)) (let ((hex (format "%04X" char)) - found first last unihan-match unihan-info - (unihan-database-handle - (and describe-char-unihan-file - (open-database (unidata-generate-database-file-name - describe-char-unihan-file - (eighth (file-attributes - describe-char-unihan-file)) - unidata-database-format) - unidata-database-format - nil "r" #o644 'no-conversion-unix))) + found first last unihan-match unihan-info unihan-database-handle (coding-system-for-read 'no-conversion-unix)) (if (re-search-forward (concat "^" hex) nil t) (setq found t) @@ -920,7 +911,16 @@ (if (and (> (length (nth 0 fields)) 13) (equal "<CJK Ideograph" (substring (nth 0 fields) 0 14))) - (if (and unihan-database-handle + (if (and describe-char-unihan-file + (setq unihan-database-handle + (open-database + (unidata-generate-database-file-name + describe-char-unihan-file + (eighth (file-attributes + describe-char-unihan-file)) + unidata-database-format) + unidata-database-format + nil "r" #o644 'no-conversion-unix)) (setq unihan-match (get-database (format "%04X" char) unihan-database-handle)