*** empty log message ***

4 files changed, 20 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index c3e082a096f..e2d9457db14 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * e/eterm.ti: Add `op' entry to enable colors in term.
+        * e/eterm: Regenerate.
+
 2004-09-04  Eric S. Raymond  <esr@thyrsus.com>
 
         * PROBLEMS: More reorganization to exile old stuff to the
diff --git a/etc/NEWS b/etc/NEWS
index 54ed3814819..021b9f32efa 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2402,6 +2402,11 @@ height) of the specified image.
 The form `(+ EXPR ...)' adds up the value of the expressions.
 The form `(- EXPR ...)' negates or subtracts the value of the expressions.
 
+** Normally, the cursor is displayed at the end of any overlay and
+text property string that may be present at the current window
+position.  The cursor may now be placed on any character of such
+strings by giving that character a non-nil `cursor' text property.
+
 ** New macro with-local-quit temporarily sets inhibit-quit to nil for use
 around potentially blocking or long-running code in timers
 and post-command-hooks.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c8da0ca418e..a37e803d11e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2004-09-07  Kim F. Storm  <storm@cua.dk>
 
+        * emacs-lisp/authors.el (authors-aliases): Add more aliases.
+        (authors-fixed-entries): Fix typo.
+        (authors-canonical-author-name): Compact multiple spaces.
+        Ignore trivial names (e.g. only first name).
+
         * term.el (term-window-width): Only use full window width on
         window system if overflow-newline-into-fringe is enabled.
         (term-mode): Don't disable overflow-newline-into-fringe.
diff --git a/src/ChangeLog b/src/ChangeLog
index ac72b86018a..f89f253f5f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (set_cursor_from_row): Fix last change.  Only use 'cursor'
+        property from text property or overlay strings at point.
+
 2004-09-07  Stefan  <monnier@iro.umontreal.ca>
 
         * xmenu.c (update_submenu_strings): YAILOM.