changeset: 5246:bf93bff989d8 tag: tip user: Mike Sperber <sperber(a)deinprogramm.de&gt; date: Fri Aug 20 11:35:58 2010 +0200 files: lisp/ChangeLog description: Recover from merge SNAFU. diff -r 0d71bcf96ffd -r bf93bff989d8 lisp/ChangeLog --- a/lisp/ChangeLog Wed Aug 18 17:44:24 2010 +0200 +++ b/lisp/ChangeLog Fri Aug 20 11:35:58 2010 +0200 ＠＠ -1,24 +1,19 ＠＠ -<<<<<<< local +2010-08-18 Mike Sperber <mike(a)xemacs.org&gt; + + * 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'. + 2010-08-15 Aidan Kehoe <kehoea(a)parhasard.net&gt; -======= -2010-08-18 Mike Sperber <mike(a)xemacs.org&gt; ->>>>>>> other - -<<<<<<< local + * specifier.el (canonicalize-inst-pair, canonicalize-spec): If a specifier tag set is correct, but an instantiator is not in an accepted format, don't error with the message "Invalid specifier tag set". Also, when we error, use error-symbols, for better structured error handling and more ease when testing. -======= - * 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'. ->>>>>>> other - -<<<<<<< local + 2010-07-24 Aidan Kehoe <kehoea(a)parhasard.net&gt; * cl-extra.el (concatenate): ＠＠ -28,8 +23,6 ＠＠ If TYPE is constant, don't inline #'concatenate, replace it by a call to the appropriate C functions. -======= ->>>>>>> other 2010-06-13 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * gnome.el: _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/mailman/listinfo/xemacs-patches