Mercurial > hg > xemacs-beta

comparison lisp/ChangeLog @ 5246:bf93bff989d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Recover from merge SNAFU.
author Mike Sperber <sperber@deinprogramm.de>
date Fri, 20 Aug 2010 11:35:58 +0200
parents 0d71bcf96ffd
children d4fae3ebf26a
comparison
equal deleted inserted replaced
5245:0d71bcf96ffd 5246:bf93bff989d8
1 <<<<<<< local 1 2010-08-18 Mike Sperber <mike@xemacs.org>
2
3 * files.el (diff-files-for-recover): Abstract this out out
4 `recover-file'.
5 (diff-buffer-with-file): Add from (GPLv2) FSF Emacs.
6 (recover-file): Use `diff-files-for-recover'.
7
2 2010-08-15 Aidan Kehoe <kehoea@parhasard.net> 8 2010-08-15 Aidan Kehoe <kehoea@parhasard.net>
3 ======= 9
4 2010-08-18 Mike Sperber <mike@xemacs.org>
5 >>>>>>> other
6
7 <<<<<<< local
8 * specifier.el (canonicalize-inst-pair, canonicalize-spec): 10 * specifier.el (canonicalize-inst-pair, canonicalize-spec):
9 If a specifier tag set is correct, but an instantiator is not in 11 If a specifier tag set is correct, but an instantiator is not in
10 an accepted format, don't error with the message "Invalid 12 an accepted format, don't error with the message "Invalid
11 specifier tag set". 13 specifier tag set".
12 Also, when we error, use error-symbols, for better structured 14 Also, when we error, use error-symbols, for better structured
13 error handling and more ease when testing. 15 error handling and more ease when testing.
14 ======= 16
15 * files.el (diff-files-for-recover): Abstract this out out
16 `recover-file'.
17 (diff-buffer-with-file): Add from (GPLv2) FSF Emacs.
18 (recover-file): Use `diff-files-for-recover'.
19 >>>>>>> other
20
21 <<<<<<< local
22 2010-07-24 Aidan Kehoe <kehoea@parhasard.net> 17 2010-07-24 Aidan Kehoe <kehoea@parhasard.net>
23 18
24 * cl-extra.el (concatenate): 19 * cl-extra.el (concatenate):
25 * cl-seq.el (remove*, cl-delete-duplicates): 20 * cl-seq.el (remove*, cl-delete-duplicates):
26 Bit vectors are also sequences; enforce this in these functions. 21 Bit vectors are also sequences; enforce this in these functions.
27 * cl-macs.el (concatenate): 22 * cl-macs.el (concatenate):
28 If TYPE is constant, don't inline #'concatenate, replace it by a 23 If TYPE is constant, don't inline #'concatenate, replace it by a
29 call to the appropriate C functions. 24 call to the appropriate C functions.
30 25
31 =======
32 >>>>>>> other
33 2010-06-13 Stephen J. Turnbull <stephen@xemacs.org> 26 2010-06-13 Stephen J. Turnbull <stephen@xemacs.org>
34 27
35 * gnome.el: 28 * gnome.el:
36 * gtk-compose.el: 29 * gtk-compose.el:
37 * gtk-marshal.el: 30 * gtk-marshal.el: