changeset: 4572:16c9098dd3d2459c112fd2f8080f6b57c7099d10
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Thu Jan 01 16:37:48 2009 +0900
files: lisp/ChangeLog lisp/descr-text.el
description:
Fix build broken by descr-text.el defcustom.
diff -r ebc01476e352f6765d1f269a30b2f7ed7095db72 -r
16c9098dd3d2459c112fd2f8080f6b57c7099d10 lisp/ChangeLog
--- a/lisp/ChangeLog Tue Dec 30 20:33:30 2008 +0000
+++ b/lisp/ChangeLog Thu Jan 01 16:37:48 2009 +0900
@@ -1,3 +1,8 @@ 2008-12-30 Aidan Kehoe <kehoea@parhasa
+2009-01-01 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * descr-text.el (describe-char-unicodedata-file):
+ Nuke build-breaking computation from defcustom initializer.
+
2008-12-30 Aidan Kehoe <kehoea(a)parhasard.net>
* make-docfile.el:
diff -r ebc01476e352f6765d1f269a30b2f7ed7095db72 -r
16c9098dd3d2459c112fd2f8080f6b57c7099d10 lisp/descr-text.el
--- a/lisp/descr-text.el Tue Dec 30 20:33:30 2008 +0000
+++ b/lisp/descr-text.el Thu Jan 01 16:37:48 2009 +0900
@@ -207,40 +207,18 @@ otherwise."
(insert "There are text properties here:\n")
(describe-property-list properties)))))
-(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))
+;; XEmacs change
+(defcustom describe-char-unicodedata-file nil
"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, typically installed with Perl.
-At the time of writing it is at the URL
+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
`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