*** empty log message ***

2 files changed, 38 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a282fb6ded..4a74c6b1e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,21 @@
+2000-04-26  Gerd Moellmann  <[email protected]>
+
+	* desktop.el (desktop-save): Save list of minor modes.
+	(desktop-create-buffer): Restore minor modes.
+	(desktop-minor-mode-table): New user-option.
+
+	* subr.el (add-minor-mode): New function.
+
+	* image.el (find-image): New function.
+	(defimage): Rewritten to find image at load time.
+
+	* startup.el (normal-top-level-add-to-load-path): Handle
+	case that the default directory is not in load-path.
+
+	* help.el: Old patch from Stefan Monnier.
+	(help-xref-on-pp): New function.
+	(describe-variable): Use it to display xrefs in a symbol's value.
+
 2000-04-26  Stefan Monnier  <[email protected]>
 
 	* cus-edit.el (custom-face): Fix parenthesis.
diff --git a/lisp/loaddefs.el b/lisp/loaddefs.el
index d226667209..fa85c1b56b 100644
--- a/lisp/loaddefs.el
+++ b/lisp/loaddefs.el
@@ -3953,7 +3953,7 @@ the first time the mode is used." nil nil)
 ;;;***
 
 ;;;### (autoloads (desktop-load-default desktop-read) "desktop" "desktop.el"
-;;;;;;  (14495 17963))
+;;;;;;  (14598 57772))
 ;;; Generated autoloads from desktop.el
 
 (autoload (quote desktop-read) "desktop" "\
@@ -8017,9 +8017,9 @@ Switches to the buffer `*ielm*', or creates it if it does not exist." t nil)
 
 ;;;***
 
-;;;### (autoloads (defimage remove-images insert-image put-image
-;;;;;;  create-image image-type-available-p image-type-from-file-header
-;;;;;;  image-type-from-data) "image" "image.el" (14524 62778))
+;;;### (autoloads (defimage find-image remove-images insert-image
+;;;;;;  put-image create-image image-type-available-p image-type-from-file-header
+;;;;;;  image-type-from-data) "image" "image.el" (14598 54652))
 ;;; Generated autoloads from image.el
 
 (autoload (quote image-type-from-data) "image" "\
@@ -8074,6 +8074,21 @@ Remove images between START and END in BUFFER.
 Remove only images that were put in BUFFER with calls to `put-image'.
 BUFFER nil or omitted means use the current buffer." nil nil)
 
+(autoload (quote find-image) "image" "\
+Find an image, choosing one of a list of image specifications.
+
+SPECS is a list of image specifications.  DOC is an optional
+documentation string.
+
+Each image specification in SPECS is a property list.  The contents of
+a specification are image type dependent.  All specifications must at
+least contain the properties `:type TYPE' and either `:file FILE' or
+`:data DATA', where TYPE is a symbol specifying the image type,
+e.g. `xbm', FILE is the file to load the image from, and DATA is a
+string containing the actual image data.  The first image
+specification whose TYPE is supported, and FILE exists, is used to
+define SYMBOL." nil nil)
+
 (autoload (quote defimage) "image" "\
 Define SYMBOL as an image.
 
@@ -13361,7 +13376,7 @@ From a program takes two point or marker arguments, BEG and END." t nil)
 ;;;***
 
 ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar"
-;;;;;;  "speedbar.el" (14597 45194))
+;;;;;;  "speedbar.el" (14598 31838))
 ;;; Generated autoloads from speedbar.el
 
 (defalias (quote speedbar) (quote speedbar-frame-mode))