From: Miles Bader <miles@gnu.org>
Date: Fri, 13 Oct 2000 01:34:00 +0000 (+0000)
Subject: (image-file-name-extensions, image-file-name-regexps): Add autoload cookies.
X-Git-Tag: emacs-pretest-21.0.90~919
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1c7e37a93fbabf11548171aeb5ba6ad203a7ff34;p=emacs.git

(image-file-name-extensions, image-file-name-regexps): Add autoload cookies.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2632d1676ef..7be8f0c6da3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-13  Miles Bader  <miles@lsi.nec.co.jp>
+
+	* image-file.el (image-file-name-extensions) 
+	(image-file-name-regexps): Add autoload cookies.
+
 2000-10-13  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/mule-cmds.el (select-safe-coding-system): If FROM
@@ -29,7 +34,6 @@
 	(cperl-invalid-face): Revert last change.
 	(cperl-init-faces): Quote cperl-invalid-face.
 
->>>>>>> 1.1252
 2000-10-12  Kenichi Handa  <handa@etl.go.jp>
 
 	* startup.el (fancy-splash-text): Remove superfluous quote.
diff --git a/lisp/image-file.el b/lisp/image-file.el
index e93f2819170..3d47cc8a2ef 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -36,6 +36,7 @@
 (require 'image)
 
 
+;;;###autoload
 (defcustom image-file-name-extensions
   '("png" "jpeg" "jpg" "gif" "tiff" "xbm" "xpm" "pbm")
   "*A list of image-file filename extensions.
@@ -55,6 +56,7 @@ variable is set using \\[customize]."
   :initialize 'custom-initialize-default
   :group 'image)
 
+;;;###autoload
 (defcustom image-file-name-regexps nil
   "*List of regexps matching image-file filenames.
 Filenames matching one of these regexps are considered image files,