Restore lisp/ChangeLog entries clobbered in 2010-08-17T10:07:41Z!jan.h.d@swipnet.se.

1 files changed, 14 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39391e73609..db60b546e6d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -30,6 +30,20 @@
         \C-cm to report-emacs-bug-insert-to-mailer and add help text
         about it.
 
+        * net/browse-url.el (browse-url-default-browser): Add cond
+        for browse-url-xdg-open.
+        (browse-url-can-use-xdg-open, browse-url-xdg-open): New functions.
+
+2010-08-17  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/cc-engine.el (c-new-BEG, c-new-END)
+        (c-fontify-recorded-types-and-refs): Define for compiler.
+        * progmodes/cc-mode.el (c-new-BEG, c-new-END): Move definitions
+        before use.
+
+        * calendar/icalendar.el (icalendar--convert-recurring-to-diary):
+        Fix format call.
+
 2010-08-17  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp.el (tramp-handle-make-symbolic-link): Flush file