*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 0e55e0e64199b7a45fd0d38cc58ababcfcdda8c9..5c81d1e726f5e9ae0a0be0e3bd28c4807126706d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1151,6 +1151,13 @@ the new function `appt-activate'. The new variable
 `appt-display-format' controls how reminders are displayed, replacing
 appt-issue-message, appt-visible, and appt-msg-window.
 
+** The new functions `diary-from-outlook', `diary-from-outlook-gnus',
+and `diary-from-outlook-rmail' can be used to import diary entries
+from Outlook-format appointments in mail messages.  The variable
+`diary-outlook-formats' can be customized to recognize additional
+formats.
+
+
 ** VC Changes
 
 *** The key C-x C-q no longer checks files in or out, it only changes

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9dfd021fdb52d561f771913512daf310cb0c002f..b76be816786e55278f9c55dec2a3371abe45c4af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2004-04-30  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+       * progmodes/fortran.el (fortran-fill): Use local var `bol' rather
+       than duplicate call to `line-beginning-position'.
+
+       * progmodes/f90.el (f90-get-present-comment-type): Return
+       whitespace, as well as comment chars, for consistent filling
+       of comment blocks.  Use `match-string-no-properties'.
+       (f90-break-line): Do not leave trailing whitespace when filling
+       comments.
+
+2004-04-30  Dave Love  <fx@gnu.org>
+
+       * calendar/diary-lib.el (diary-outlook-formats): New variable.
+       (diary-from-outlook-internal, diary-from-outlook)
+       (diary-from-outlook-gnus, diary-from-outlook-rmail): New
+       functions to import diary entries from Outlook-format
+       appointments in mail messages.
+
 2004-04-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/python.el (python-send-command): New fun.