2 files changed, 22 insertions, 1 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 0e041427931..345832338ca 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -58,6 +58,11 @@ See the files mac/README and mac/INSTALL for build instructions.
 * Changes in Emacs 21.4
 
 +++
+** The mode line position information now comes before the major mode.
+When the file is maintained under version control, that information
+appears between the position information and the major mode.
+   
++++
 ** You can now customize the use of window fringes.  To control this
 for all frames, use M-x fringe-mode or the Show/Hide submenu of the
 top-level Options menu, or customize the `fringe-mode' variable.  To
@@ -608,6 +613,17 @@ now uses normal-erase-is-backspace-mode.
 controls whether or not the function `make-auto-save-file-name' will
 attempt to construct a unique auto-save name (e.g. for remote files).
 
++++
+** Diary sexp entries can have custom marking in the calendar.
+Diary sexp functions which only apply to certain days (such as
+`diary-block' or `diary-cyclic' now take an optional parameter MARK,
+which is the name of a face or a single-character string indicating
+how to highlight the day in the calendar display.  Specifying a
+single-character string as @var{mark} places the character next to the
+day in the calendar.  Specifying a face highlights the day with that
+face.  This lets you have different colors or markings for vacations,
+appointments, paydays or anything else using a sexp.
+
 ** 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 d4199273493..1879246c720 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-29  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/ispell.el (check-ispell-version): Bind default-directory
+        to avoid errors.  Kill the old temp buffer at the beginning.
+
 2002-07-29  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
         * scroll-all.el (scroll-all-mode): Make argument optional.  Doc fix.
@@ -10,7 +15,7 @@
 2002-07-29  Kenichi Handa  <handa@etl.go.jp>
 
         * international/mule.el (ctext-post-read-conversion): Add support
-        for emboded utf-8 encodng (ESC % G ... ESC % @).
+        for embedded utf-8 encoding (ESC % G ... ESC % @).
 
 2002-07-28  Kenichi Handa  <handa@etl.go.jp>