2 files changed, 35 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c3c557e82d5..a44099bfb8e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,35 @@
+2000-06-11  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * imenu.el (imenu-generic-expression): Docstring fix.
+
+        * composite.el (composition-function-table): Move the `put'
+        below the autoload cookie so we can load the file before loaddefs.
+
+        * avoid.el (mouse-avoidance-random-shape): Don't quote lambda.
+
+        * emacs-lisp/autoload.el (make-autoload): Use `cond'.
+        Handle easy-mmode-define-global-mode.
+        For complex macros like define-minor-mode that can generate
+        several autoload entries, try to autoload entries in the
+        macroexpanded code.
+
+        * emacs-lisp/easy-mmode.el (define-minor-mode):
+        If KEYMAP is a symbol, just use it.
+        Use byte-compile-current-file and load-file-name to infer the
+        proper :require to pass to defcustom.
+        Wrap the hook var into `progn' so as not to autoload it.
+        Add a :autoload-end cookie.
+        Be more careful about the evaluation of KEYMAP.
+        (easy-mmode-define-global-mode): Add a :autoload-end cookie.
+        (define-derived-mode): Move define-abbrev-table outside of defvar.
+
+2000-06-10  Stefan Monnier  <monnier@cs.yale.edu>
+
+        * Makefile (EMACSOPT): Remove --no-init-file (implied by -batch).
+        (autoloads): Explicitly load `autoload' to bootstrap without loaddefs.
+        (backup-compiled-files): Ignore errors during `tar'.
+        (bootstrap): Make autoloads before elc files.
+
 2000-06-10  Kenichi Handa  <handa@etl.go.jp>
 
         * international/mule.el (set-buffer-file-coding-system): If one of
@@ -10,7 +42,7 @@
 
         * tar-mode.el (tar-copy): Supply MUSTBENEW arg to write-region.
 
-        * executable.el: Byte compile dynamic.
+        * progmodes/executable.el: Byte compile dynamic.
         (executable-insert): Change custom type.
         (executable-find): Add autoload cookie.
         (executable-make-buffer-file-executable-if-script-p): New
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 64a5bd9941f..393a1967ac1 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -187,8 +187,8 @@ or like this:
  (MENU-TITLE REGEXP INDEX FUNCTION ARGUMENTS...)
 with zero or more ARGUMENTS.  The former format creates a simple element in
 the index alist when it matches; the latter creates a special element
-of the form  (NAME FUNCTION POSITION-MARKER ARGUMENTS...)
-with FUNCTION and ARGUMENTS beiong copied from `imenu-generic-expression'.
+of the form  (NAME POSITION-MARKER FUNCTION ARGUMENTS...)
+with FUNCTION and ARGUMENTS copied from `imenu-generic-expression'.
 
 MENU-TITLE is a string used as the title for the submenu or nil if the
 entries are not nested.