2 new commits in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/ee0c60ee6616/
Changeset: ee0c60ee6616
User: kehoea
Date: 2017-12-22 21:28:32+00:00
Summary: Don't crash in redisplay with Ethiopic and error-checking.
src/ChangeLog addition:
2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net>
* redisplay-x.c (separate_textual_runs_mule):
The output of a charset's CCL program is just two octets, it is
incorrect and buggy to transform it to an "external charset
codepoint", something that will usually error in redisplay. Remove
this unicode-internal change from Ben.
Affected #: 2 files
diff -r 46efc7173defd0f4f41bd8f3819970c4876c551a -r
ee0c60ee6616be2b917712a649809b8f6e5e2d06 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * redisplay-x.c (separate_textual_runs_mule):
+ The output of a charset's CCL program is just two octets, it is
+ incorrect and buggy to transform it to an "external charset
+ codepoint", something that will usually error in redisplay. Remove
+ this unicode-internal change from Ben.
+
2017-12-20 Aidan Kehoe <kehoea(a)parhasard.net>
Use Lisp characters as the keysym for event objects reflecting
diff -r 46efc7173defd0f4f41bd8f3819970c4876c551a -r
ee0c60ee6616be2b917712a649809b8f6e5e2d06 src/redisplay-x.c
--- a/src/redisplay-x.c
+++ b/src/redisplay-x.c
@@ -357,9 +357,6 @@
ccl_driver (&char_converter, 0, buf, 0, 0, 0, CCL_MODE_ENCODING);
byte1 = char_converter.reg[1];
byte2 = char_converter.reg[2];
- get_external_charset_codepoint (charset, make_fixnum (byte1),
- make_fixnum (byte2),
- &byte1, &byte2, 1);
}
else if (EQ (charset, Vcharset_ascii) && byte2 != CANT_DISPLAY_CHAR)
{
https://bitbucket.org/xemacs/xemacs/commits/b5c15ce519c2/
Changeset: b5c15ce519c2
User: kehoea
Date: 2017-12-22 21:39:11+00:00
Summary: Use the UnicodeData.txt installed with TeX if available, descr-text.el
lisp/ChangeLog addition:
2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net>
* descr-text.el (describe-char-unicodedata-file):
The UnicodeData.txt installed with Perl no longer serves our
needs. Use that installed by TeX instead, if available.
Affected #: 2 files
diff -r ee0c60ee6616be2b917712a649809b8f6e5e2d06 -r
b5c15ce519c23670ffba7da0c365f5044e137d90 lisp/ChangeLog
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * descr-text.el (describe-char-unicodedata-file):
+ The UnicodeData.txt installed with Perl no longer serves our
+ needs. Use that installed by TeX instead, if available.
+
2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net>
* compose.el: Rename from x-compose.el, it's not
diff -r ee0c60ee6616be2b917712a649809b8f6e5e2d06 -r
b5c15ce519c23670ffba7da0c365f5044e137d90 lisp/descr-text.el
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -208,31 +208,20 @@
(describe-property-list properties)))))
(defcustom describe-char-unicodedata-file
- ;; XEmacs change; initialise this by default, using Perl.
- (let ((have-perl
+ ;; XEmacs change; initialise this by default, using TeX.
+ (let ((have-kpsewhich
(member-if
#'(lambda (path)
- (file-exists-p (format "%s%cperl" path directory-sep-char)))
+ (file-exists-p (format "%s%ckpsewhich" path directory-sep-char)))
exec-path))
- installprivlib res)
- (when have-perl
- (setq installprivlib
+ path)
+ (when have-kpsewhich
+ (setq path
(with-string-as-buffer-contents ""
- (shell-command "perl -V:installprivlib" t)
- ;; 1+ because buffer offsets start at one.
- (delete-region 1 (1+ (length "installprivlib='")))
- ;; Delete the final newline, semicolon and quotation mark.
- (delete-region (- (point-max) 3) (point-max))))
- (cond
- ((file-exists-p
- (setq res
- (format "%s%cunicore%cUnicodeData.txt"
- installprivlib directory-sep-char directory-sep-char))))
- ((file-exists-p
- (setq res
- (format "%s%cunicode%cUnicodeData.txt"
- installprivlib directory-sep-char directory-sep-char)))))
- res))
+ (shell-command "kpsewhich UnicodeData.txt" t)
+ ;; Delete the final newline
+ (delete-region (- (point-max) 1) (point-max))))
+ (if (file-exists-p path) path)))
"Location of Unicode data file.
This is the UnicodeData.txt file from the Unicode Consortium, used for
diagnostics. If it is non-nil `describe-char' will print data
Repository URL:
https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.