Mercurial > hg > xemacs-beta
comparison 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 |
comparison
equal
deleted
inserted
replaced
5003:6b6b0f8ab749 | 5004:788c38f20376 |
---|---|
150 ;; Initialize Installation-string. We do it before loading | 150 ;; Initialize Installation-string. We do it before loading |
151 ;; anything so that dumped code can make use of its value. | 151 ;; anything so that dumped code can make use of its value. |
152 (save-current-buffer | 152 (save-current-buffer |
153 (set-buffer (get-buffer-create (generate-new-buffer-name | 153 (set-buffer (get-buffer-create (generate-new-buffer-name |
154 " *temp*"))) | 154 " *temp*"))) |
155 ;; insert-file-contents-internal bogusly calls | |
156 ;; format-decode without checking if it's defined. | |
157 (fset 'format-decode #'(lambda (f l &optional v) l)) | |
158 (insert-file-contents-internal | 155 (insert-file-contents-internal |
159 (expand-file-name "Installation" build-directory) | 156 (expand-file-name "Installation" build-directory) |
160 ;; Relies on our working out the system coding system | 157 ;; Relies on our working out the system coding system |
161 ;; correctly at startup. | 158 ;; correctly at startup. |
162 nil nil nil nil | 159 nil nil nil nil |
163 ;; Installation-file-coding-system is actually respected in | 160 ;; Installation-file-coding-system is actually respected in |
164 ;; mule/general-late.el, after all the dumped coding systems have been | 161 ;; mule/general-late.el, after all the dumped coding systems have been |
165 ;; loaded. | 162 ;; loaded. |
166 'binary) | 163 'binary) |
167 (fmakunbound 'format-decode) | |
168 (prog1 (buffer-substring) | 164 (prog1 (buffer-substring) |
169 (kill-buffer (current-buffer)))) | 165 (kill-buffer (current-buffer)))) |
170 "Description of XEmacs installation. | 166 "Description of XEmacs installation. |
171 | 167 |
172 This reflects the values that the configure script worked out at build time, | 168 This reflects the values that the configure script worked out at build time, |