# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1027964243 0
# Node ID 11f94cbe273f0c13e08d5bc6510e8659446fc63a
# Parent  cd917c3865bfa5132d83667687769e1d546f0374
*** empty log message ***

diff -r cd917c3865bf -r 11f94cbe273f etc/NEWS
--- a/etc/NEWS	Mon Jul 29 17:31:47 2002 +0000
+++ b/etc/NEWS	Mon Jul 29 17:37:23 2002 +0000
@@ -58,6 +58,11 @@
 * 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 @@
 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 -r cd917c3865bf -r 11f94cbe273f lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jul 29 17:31:47 2002 +0000
+++ b/lisp/ChangeLog	Mon Jul 29 17:37:23 2002 +0000
@@ -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>