Mercurial > hg > xemacs-beta
diff lisp/version.el @ 5004:788c38f20376
Do not assume #'format-decode exists in fileio.c.
src/ChangeLog addition:
2010-02-07 Aidan Kehoe <kehoea@parhasard.net>
* fileio.c (Finsert_file_contents_internal):
Only call format-decode if it has a function binding.
(build_annotations): Only call format-annotate-function if it has
a function binding; incidentally only calling #'car-less-than-car
if *it* has a function binding.
(syms_of_fileio): #'car-less-than-car and #'cdr-less-than-cdr are
now in Lisp.
lisp/ChangeLog addition:
2010-02-07 Aidan Kehoe <kehoea@parhasard.net>
* make-docfile.el (format-decode): Remove this temporary function
definition, now we check the symbol is bound in fileio.c
* version.el (format-decode): Ditto.
* format.el (car-less-than-car, cdr-less-than-cdr): Move these
here from fileio.c, now they are only called once format.el is
available.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 07 Feb 2010 23:31:50 +0000 |
| parents | 6a3006b37260 |
| children | 5efbd1253905 |
line wrap: on
line diff
--- a/lisp/version.el Sun Feb 07 14:37:35 2010 +0000 +++ b/lisp/version.el Sun Feb 07 23:31:50 2010 +0000 @@ -152,9 +152,6 @@ (save-current-buffer (set-buffer (get-buffer-create (generate-new-buffer-name " *temp*"))) - ;; insert-file-contents-internal bogusly calls - ;; format-decode without checking if it's defined. - (fset 'format-decode #'(lambda (f l &optional v) l)) (insert-file-contents-internal (expand-file-name "Installation" build-directory) ;; Relies on our working out the system coding system @@ -164,7 +161,6 @@ ;; mule/general-late.el, after all the dumped coding systems have been ;; loaded. 'binary) - (fmakunbound 'format-decode) (prog1 (buffer-substring) (kill-buffer (current-buffer)))) "Description of XEmacs installation. @@ -175,4 +171,4 @@ occasionally used, in a way the XEmacs developers don't endorse, to work out version information. ") -;;; version.el ends here \ No newline at end of file +;;; version.el ends here