*** empty log message ***

3 files changed, 43 insertions, 4 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 727dfadc54f..3b1de666a24 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -351,12 +351,15 @@ the next/previous matching line found by M-x occur.
 +++
 ** Telnet now prompts you for a port number with C-u M-x telnet.
 
-+++
-** New command line option -Q or --bare-bones.
+** New command line option -Q or --quick.
 
 This is like using -q --no-site-file, but in addition it also disables
-the menu-bar, the tool-bar, the scroll-bars, tool tips, the blinking
-cursor, and the fancy startup screen.
+the fancy startup screen.
+
+** New command line option -D or --basic-display.
+
+Disables the menu-bar, the tool-bar, the scroll-bars, tool tips, and
+the blinking cursor.
 
 +++
 ** New command line option -nbc or --no-blinking-cursor disables
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 393c2331fa7..1ddf9f5594c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2005-04-10  Richard M. Stallman  <rms@gnu.org>
+
+        * startup.el (fancy-splash-tail): Update copyright year.
+        (command-line): Split part of -Q into -D.
+        (emacs-basic-display): New defvar.
+        (fancy-splash-text): Correct name of menu item.
+
+        * saveplace.el (save-place-alist-to-file): Catch errors writing file.
+
+        * info.el (Info-fontify-node): Handle fontification of multiple * Menu
+        lines in one node.
+
+        * comint.el (comint-send-input): New arg ARTIFICIAL.
+        Callers in this file changed.
+
+        * abbrev.el (define-abbrevs): Read system abbrevs properly.
+
+        * emacs-lisp/map-ynp.el (map-y-or-n-p): Clarify RET/q in help message.
+
+2005-04-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url/url-ldap.el (url-ldap): Add docstring.  Fix call to
+        `ldap-search-internal'.
+
 2005-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * files.el (set-auto-mode-1): Use line-end-position.
@@ -43,6 +67,11 @@
         (days-to-time, time-subtract, time-add): Don't use the #xhhhh
         syntax which Emacs 20 doesn't support.
 
+2005-04-09  Richard M. Stallman  <rms@gnu.org>
+
+        * help.el (describe-key-briefly, describe-key): Replace
+        strings as event types with "(any string)".
+
 2005-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * arc-mode.el (archive-mode-map): Move initialization into
diff --git a/src/ChangeLog b/src/ChangeLog
index 860c3847941..26b8a9ce5ad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-10  Richard M. Stallman  <rms@gnu.org>
+
+        * emacs.c (standard_args): Rename --bare-bones to --quick.
+        Add -D aka --basic-display.
+
+        * buffer.c (Fmake_indirect_buffer): Clear out some local variables.
+
 2005-04-09  Richard M. Stallman  <rms@gnu.org>
 
         * keymap.c (where_is_internal): Convert a string used as event type