comparison src/ChangeLog @ 4569:80e0588fb42f

Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 28 Dec 2008 14:55:02 +0000
parents 69a1eda3da06 1d74a1d115ee
children ebc01476e352
comparison
equal deleted inserted replaced
4537:7ca6d57ce12d 4569:80e0588fb42f
1 2008-12-28 Aidan Kehoe <kehoea@parhasard.net>
2
3 * file-coding.c (Fmake_coding_system):
4 Document our use of the safe-chars and safe-charsets properties,
5 and the differences compared to GNU.
6 (make_coding_system_1): Don't drop the safe-chars and
7 safe-charsets properties.
8 (Fcoding_system_property): Return the safe-chars and safe-charsets
9 properties when asked for them.
10 * file-coding.h (CODING_SYSTEM_SAFE_CHARSETS):
11 * coding-system-slots.h:
12 Make the safe-chars and safe-charsets slots available in these
13 headers.
14
1 2008-12-22 Aidan Kehoe <kehoea@parhasard.net> 15 2008-12-22 Aidan Kehoe <kehoea@parhasard.net>
2 16
3 * symbols.c (Fdefine_function): 17 * symbols.c (Fdefine_function):
4 * eval.c (define_function): 18 * eval.c (define_function):
5 Record explicitly that we're defining a function in the load 19 Record explicitly that we're defining a function in the load
147 2008-08-10 Aidan Kehoe <kehoea@parhasard.net> 161 2008-08-10 Aidan Kehoe <kehoea@parhasard.net>
148 162
149 * objects-xlike-inc.c (charset_table): Remove the entry for 163 * objects-xlike-inc.c (charset_table): Remove the entry for
150 Vcharset_arabic_iso8859_7, thank you Robert Delius Royar. 164 Vcharset_arabic_iso8859_7, thank you Robert Delius Royar.
151 165
166 =======
167 >>>>>>> other
152 2008-08-05 Aidan Kehoe <kehoea@parhasard.net> 168 2008-08-05 Aidan Kehoe <kehoea@parhasard.net>
153 169
154 * mule-charset.c (complex_vars_of_mule_charset): 170 * mule-charset.c (complex_vars_of_mule_charset):
155 Remove Vcharset_arabic_iso8859_7. 171 Remove Vcharset_arabic_iso8859_7.
156 * lisp.h: Remove Vcharset_arabic_iso8859_7. 172 * lisp.h: Remove Vcharset_arabic_iso8859_7.