commit: Correct syntax of #'error calls, descr-text.el

changeset: 4481:f9c70d94f42741543645c976bcc89aec6dc63128 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun Jul 20 15:04:20 2008 +0200 files: lisp/ChangeLog lisp/descr-text.el description: Correct syntax of #'error calls, descr-text.el 2008-07-20 Aidan Kehoe <kehoea(a)parhasard.net&gt; * descr-text.el (describe-char-unicode-data): Correct three calls to #'error; it doesn't take #'message style format strings and arguments. diff -r 74caf140505b589959374ba69b7e5cfd5a38aadf -r f9c70d94f42741543645c976bcc89aec6dc63128 lisp/ChangeLog --- a/lisp/ChangeLog Sat Jul 19 15:19:59 2008 +0200 +++ b/lisp/ChangeLog Sun Jul 20 15:04:20 2008 +0200 ＠＠ -1,3 +1,9 ＠＠ 2008-07-19 Aidan Kehoe <kehoea＠parhasa +2008-07-20 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * descr-text.el (describe-char-unicode-data): + Correct three calls to #'error; it doesn't take #'message style + format strings and arguments. + 2008-07-19 Aidan Kehoe <kehoea(a)parhasard.net&gt; * descr-text.el (describe-property-list): Move the (require diff -r 74caf140505b589959374ba69b7e5cfd5a38aadf -r f9c70d94f42741543645c976bcc89aec6dc63128 lisp/descr-text.el --- a/lisp/descr-text.el Sat Jul 19 15:19:59 2008 +0200 +++ b/lisp/descr-text.el Sun Jul 20 15:04:20 2008 +0200 ＠＠ -677,7 +677,8 ＠＠ The list is null if CHAR isn't found in (when describe-char-unicodedata-file (unless (file-exists-p describe-char-unicodedata-file) (error 'file-error - "`unicodedata-file' %s not found" describe-char-unicodedata-file)) + (format "`unicodedata-file' %s not found" + describe-char-unicodedata-file))) ;; XEmacs change; accept a character argument, use the cache if ;; appropriate. (when (characterp char) ＠＠ -697,13 +698,14 ＠＠ The list is null if CHAR isn't found in (coding-system-for-read 'no-conversion-unix) key lookup) (unless database-handle - (error 'io-error "Could not open %s as a %s database" - (unidata-generate-database-file-name - describe-char-unicodedata-file - (eighth (file-attributes - describe-char-unicodedata-file)) - unidata-database-format) - unidata-database-format)) + (error 'io-error + (format "Could not open %s as a %s database" + (unidata-generate-database-file-name + describe-char-unicodedata-file + (eighth (file-attributes + describe-char-unicodedata-file)) + unidata-database-format) + unidata-database-format))) (setq key (format "%04X" char) lookup (get-database key database-handle)) (if lookup ＠＠ -761,7 +763,8 ＠＠ The list is null if CHAR isn't found in (unless (or (= 13 (length fields)) (= 14 (length fields))) (error 'invalid-argument - "Invalid contents in %s" describe-char-unicodedata-file)) + (format "Invalid contents in %s" + describe-char-unicodedata-file))) ;; The field names and values lists are slightly ;; modified from Mule-UCS unidata.el. (apply #'list _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches