*** empty log message ***

4 files changed, 64 insertions, 2 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 947922a4888..c641fbe106c 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -37,6 +37,9 @@ Assigned to Bill Wohler <wohler@newt.com>.
 
 ** Is there a basic problem with cl-byte-compile-compiler-macro?
 
+** Recalculate the tool bar height after changing the default font.
+(Bug report by Yamamoto Mistuharu, 31 Mar 2006)
+
 ** Markus Gritsch's report about Emacs looping on Windoze with the following
 .emacs file, and then reduce Emacs frame width to "something quite narrow":
         (setq-default truncate-lines t)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28469a70ecb..ab15b6dce76 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,34 @@
+2006-04-18  Richard Stallman  <rms@gnu.org>
+
+        * tooltip.el (tooltip-mode, tooltip-use-echo-area): Doc fixes.
+
+        * imenu.el (imenu-create-index-function, imenu--index-alist)
+        (imenu--last-menubar-index-alist, imenu--make-index-alist)
+        (imenu-default-create-index-function, imenu--generic-function):
+        Doc fixes.
+
+        * image-mode.el (image-toggle-display): Handle tar and arc subfiles.
+
+        * help-mode.el (help-mode): Set view-exit-action to delete window.
+
+        * env.el (setenv): Get rid of arg UNSET.  Interactive unsetting
+        now works by passing nil as arg.
+
+        * apropos.el (apropos-print): Don't do where-is on self-insert-command.
+
+        * abbrev.el (edit-abbrevs-redefine): Temporarily widen.
+        (read-abbrev-file): Provide default when reading filename.
+
+        * files.el (enable-local-variables): Allow :all as value.
+        (hack-local-variables): Implement that value.
+        (safe-local-variable-values, safe-local-eval-forms)
+        (enable-local-variables): Mark as risky.
+        (find-file-visit-truename, kept-old-versions): Mark safe.
+
+        * time-stamp.el (time-stamp-format, time-stamp-line-limit)
+        (time-stamp-start, time-stamp-end, time-stamp-inserts-lines)
+        (time-stamp-count, time-stamp-pattern): Add safe-local-variable prop.
+
 2006-04-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/tcl.el (tcl-send-string, tcl-send-region):
@@ -158,6 +189,7 @@
 
         * subr.el (read-passwd): Bind `message-log-max' to nil.
 
+>>>>>>> 1.9411
 2006-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/perl-mode.el (perl-indent-new-calculate):
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 982be7e41a9..48205488ef8 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-18  Richard Stallman  <rms@gnu.org>
+
+        * tips.texi (Coding Conventions): Explain when the package's
+        prefix should appear later on (not at the start of the name).
+
+        * searching.texi (String Search): Clarify effect of NOERROR.
+
+        * modes.texi (Imenu): Clarify what special items do.
+
+        * hooks.texi (Standard Hooks): Delete text about old hook names.
+
 2006-04-17  Romain Francoise  <romain@orebokech.com>
 
         * variables.texi (Local Variables): Update the default value of
@@ -64,8 +75,7 @@
 
 2006-03-19  Alan Mackenzie  <acm@muc.de>
 
-        * text.texi (Special Properties): Clarify the definition of
-        'fontified.
+        * text.texi (Special Properties): Clarify `fontified' property.
 
 2006-03-16  Richard Stallman  <rms@gnu.org>
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 8a00cf2dbd4..f0f504e6e64 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2006-04-18  Richard Stallman  <rms@gnu.org>
+
+        * xmenu.c (restore_menu_items, save_menu_items): New fns.
+        (set_frame_menubar): Use save_menu_items.  Save updated vector in
+        the frame before unwinding it.  Don't use unuse_menu_items.  Don't
+        use discard_menu_items.
+        (digest_single_submenu): Abort if an item is not in a pane.
+        (init_menu_items): Put the error check at the top.
+
+        * keymap.c (describe_map): Make "shadowed" warning more verbose.
+
+        * window.c (adjust_window_trailing_edge): Correctly distinguish
+        series vs parallel cases, even when window has no parent.
+
+        * abbrev.c (record_symbol): New function.
+        (Finsert_abbrev_table_description): Sort the abbrevs alphabetically.
+
 2006-04-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * image.c (x_create_bitmap_from_data) [MAC_OS]: Don't check return