APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1513978751 0 # Fri Dec 22 21:39:11 2017 +0000 # Node ID b5c15ce519c23670ffba7da0c365f5044e137d90 # Parent ee0c60ee6616be2b917712a649809b8f6e5e2d06 Use the UnicodeData.txt installed with TeX if available, descr-text.el lisp/ChangeLog addition: 2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; * 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. diff -r ee0c60ee6616 -r b5c15ce519c2 lisp/ChangeLog --- a/lisp/ChangeLog Fri Dec 22 21:28:32 2017 +0000 +++ b/lisp/ChangeLog Fri Dec 22 21:39:11 2017 +0000 ＠＠ -1,3 +1,9 ＠＠ +2017-12-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * 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&gt; * compose.el: Rename from x-compose.el, it's not diff -r ee0c60ee6616 -r b5c15ce519c2 lisp/descr-text.el --- a/lisp/descr-text.el Fri Dec 22 21:28:32 2017 +0000 +++ b/lisp/descr-text.el Fri Dec 22 21:39:11 2017 +0000 ＠＠ -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 -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)