# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1083351313 0
# Node ID fd5403ebeab16935d1282cbf613e3782181e4d84
# Parent  f5da8d364dbaa1905e0471a342f2cb9dad2d5239
*** empty log message ***

diff -r f5da8d364dba -r fd5403ebeab1 etc/NEWS
--- a/etc/NEWS	Fri Apr 30 18:54:44 2004 +0000
+++ b/etc/NEWS	Fri Apr 30 18:55:13 2004 +0000
@@ -1151,6 +1151,13 @@
 `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 -r f5da8d364dba -r fd5403ebeab1 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Apr 30 18:54:44 2004 +0000
+++ b/lisp/ChangeLog	Fri Apr 30 18:55:13 2004 +0000
@@ -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.