# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 1000375454 0
# Node ID d8fa6a1b766771f4c72b3bb549ba6ad265b295fe
# Parent  d56dcab29cce499640ba8b41f11a14f953e30694
*** empty log message ***

diff -r d56dcab29cce -r d8fa6a1b7667 ChangeLog
--- a/ChangeLog	Thu Sep 13 10:02:35 2001 +0000
+++ b/ChangeLog	Thu Sep 13 10:04:14 2001 +0000
@@ -1,3 +1,10 @@
+2001-09-13  Milan Zamazal  <pdm@zamazal.org>
+
+	* progmodes/compile.el (grep-compute-defaults): Don't set
+	grep-command/grep-find-command when it is already non-nil.
+	(grep-command): Make it a user option.
+	(grep-find-command): Likewise.
+
 2001-09-05  Gerd Moellmann  <gerd@gnu.org>
 
 	* configure.in: Avoid `$@' which is handled specially in
diff -r d56dcab29cce -r d8fa6a1b7667 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 13 10:02:35 2001 +0000
+++ b/lisp/ChangeLog	Thu Sep 13 10:04:14 2001 +0000
@@ -1,3 +1,10 @@
+2001-09-13  Gerd Moellmann  <gerd@gnu.org>
+
+	* simple.el (minibuffer-prompt-modification)
+	(minibuffer-prompt-insertion): New functions.
+	(minibuffer-prompt-properties): Use `modification-hooks' and
+	`insert-in-front-hooks'.
+
 2001-09-12  Richard M. Stallman  <rms@gnu.org>
 
 	* textmodes/outline.el (outline-regexp): Doc fix.
@@ -5,6 +12,10 @@
 
 2001-09-12  Gerd Moellmann  <gerd@gnu.org>
 
+	* ediff-mult.el (ediff-get-meta-info): Take into account that data
+	from `ediff-meta-info' properties need not be an overlay.  From
+	David Ponce <dponce@voila.fr>.
+
 	* isearch.el (isearch-intersects-p): Fix end checks.
 
 2001-09-11  Eli Zaretskii  <a34785@is.elta.co.il>