Mercurial > hg > xemacs-beta

comparison lisp/ChangeLog @ 5245:0d71bcf96ffd

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