carbon2-commit: Merge, add a ChangeLog entry.

changeset: 4659:69cd8e2d2a88cdb49a5ac2e83fa2fd06b7a15484 parent: 4657:ad2d2f4848f5bb9cb7041ffb495903156acdc114 parent: 4658:2d9ba8d925b21985ea085a67a14f6671a77e80b4 user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun Feb 15 12:32:48 2009 +0000 files: lisp/ChangeLog lisp/descr-text.el description: Merge, add a ChangeLog entry. diff -r ad2d2f4848f5bb9cb7041ffb495903156acdc114 -r 69cd8e2d2a88cdb49a5ac2e83fa2fd06b7a15484 lisp/ChangeLog --- a/lisp/ChangeLog Fri Feb 13 15:44:05 2009 +0000 +++ b/lisp/ChangeLog Sun Feb 15 12:32:48 2009 +0000 ＠＠ -1,3 +1,10 ＠＠ 2009-02-02 Aidan Kehoe <kehoea＠parhasa +2009-02-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * descr-text.el (describe-char-unicodedata-file): + Back out Stephen's change of 2009-01-01, 16c9098dd3d2; do a + Mercurial merge, add this ChangeLog entry. + See also http://mid.gmane.org/8763jbsyr7.fsf＠xemacs.org . + 2009-02-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * mule/latin.el (macintosh): diff -r ad2d2f4848f5bb9cb7041ffb495903156acdc114 -r 69cd8e2d2a88cdb49a5ac2e83fa2fd06b7a15484 lisp/descr-text.el --- a/lisp/descr-text.el Fri Feb 13 15:44:05 2009 +0000 +++ b/lisp/descr-text.el Sun Feb 15 12:32:48 2009 +0000 ＠＠ -209,18 +209,40 ＠＠ otherwise." (insert "There are text properties here:\n") (describe-property-list properties)))))  -;; XEmacs change -(defcustom describe-char-unicodedata-file nil +(defcustom describe-char-unicodedata-file + ;; XEmacs change; initialise this by default, using Perl. + (let ((have-perl + (member-if + #'(lambda (path) + (file-exists-p (format "%s%cperl" path directory-sep-char))) + exec-path)) + installprivlib res) + (when have-perl + (setq installprivlib + (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)) "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 looked up from it. This facility is mostly of use to people doing multilingual development. -This is a fairly large file, installed on many systems by Perl, in the -`unicore' subdirectory of the Perl library tree \(\"perl -V:installprivlib\" -will tell you where that is.) You can also get the current version from the -Unicode Consortium at the URL +This is a fairly large file, typically installed with Perl. +At the time of writing it is at the URL `http://www.unicode.org/Public/UNIDATA/UnicodeData.txt'. It is possible to build a DBM or Berkeley index cache for this file, so that _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches