Merged from miles@gnu.org--gnu-2005 (patch 66, 266-268)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-266
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-267
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-268
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-66
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-330

1 files changed, 30 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8b97c774aaa..4d8e8c6dd52 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,33 @@
+2005-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * isearch.el (isearch-edit-string): Make the search-ring available for
+        minibuffer history commands.
+        (minibuffer-local-isearch-map): Remove bindings for M-p and M-n,
+        the default history commands now work just as well.
+        (isearch-ring-retreat-edit, isearch-ring-advance-edit): Remove.
+
+2005-04-18  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua--pre-command-handler): Add more
+        elaborate check for shift modifier on non-window systems.
+
+2005-04-18  Lars Hansen  <larsh@math.ku.dk>
+
+        * desktop.el: Make "--no-desktop" turn off `desktop-save-mode'.
+
+2005-04-18  Kim F. Storm  <storm@cua.dk>
+
+        * tooltip.el (tooltip-show): Change second arg to USE-ECHO-AREA
+        and make it optional.  Don't test tooltip-gud-echo-area here.
+        (tooltip-gud-process-output, gdb-tooltip-print):
+        Pass tooltip-gud-echo-area to tooltip-show.
+        (tooltip-help-tips): Remove second optional arg to tooltip-show.
+
+2005-04-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * tooltip.el (tooltip-mode): `emacs-quick-startup' and
+        `display-graphic-p' may not be bound yet.
+
 2005-04-17  Luc Teirlinck  <teirllm@auburn.edu>
 
         * startup.el (command-line): No longer enable Xterm Mouse mode by