# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1094591761 0
# Node ID ffa2a0547c4b801891e5d540505d4412dc91e952
# Parent  4a550d52d08d53d32883a3eded7c65602ee41d97
*** empty log message ***

diff -r 4a550d52d08d -r ffa2a0547c4b etc/ChangeLog
--- a/etc/ChangeLog	Tue Sep 07 21:11:29 2004 +0000
+++ b/etc/ChangeLog	Tue Sep 07 21:16:01 2004 +0000
@@ -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 -r 4a550d52d08d -r ffa2a0547c4b etc/NEWS
--- a/etc/NEWS	Tue Sep 07 21:11:29 2004 +0000
+++ b/etc/NEWS	Tue Sep 07 21:16:01 2004 +0000
@@ -2402,6 +2402,11 @@
 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 -r 4a550d52d08d -r ffa2a0547c4b lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Sep 07 21:11:29 2004 +0000
+++ b/lisp/ChangeLog	Tue Sep 07 21:16:01 2004 +0000
@@ -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 -r 4a550d52d08d -r ffa2a0547c4b src/ChangeLog
--- a/src/ChangeLog	Tue Sep 07 21:11:29 2004 +0000
+++ b/src/ChangeLog	Tue Sep 07 21:16:01 2004 +0000
@@ -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.