diff options
| author | Miles Bader | 2000-10-13 01:34:00 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-10-13 01:34:00 +0000 |
| commit | 1c7e37a93fbabf11548171aeb5ba6ad203a7ff34 (patch) | |
| tree | db83f75c9a01ffaa40f49ccc6b73e005de743b43 | |
| parent | 038f27a72e582d5a8b7f7935bf36ee7ed6ecb8bd (diff) | |
| download | emacs-1c7e37a93fbabf11548171aeb5ba6ad203a7ff34.tar.gz emacs-1c7e37a93fbabf11548171aeb5ba6ad203a7ff34.zip | |
(image-file-name-extensions, image-file-name-regexps): Add autoload cookies.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/image-file.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2632d1676ef..7be8f0c6da3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-10-13 Miles Bader <miles@lsi.nec.co.jp> | ||
| 2 | |||
| 3 | * image-file.el (image-file-name-extensions) | ||
| 4 | (image-file-name-regexps): Add autoload cookies. | ||
| 5 | |||
| 1 | 2000-10-13 Kenichi Handa <handa@etl.go.jp> | 6 | 2000-10-13 Kenichi Handa <handa@etl.go.jp> |
| 2 | 7 | ||
| 3 | * international/mule-cmds.el (select-safe-coding-system): If FROM | 8 | * international/mule-cmds.el (select-safe-coding-system): If FROM |
| @@ -29,7 +34,6 @@ | |||
| 29 | (cperl-invalid-face): Revert last change. | 34 | (cperl-invalid-face): Revert last change. |
| 30 | (cperl-init-faces): Quote cperl-invalid-face. | 35 | (cperl-init-faces): Quote cperl-invalid-face. |
| 31 | 36 | ||
| 32 | >>>>>>> 1.1252 | ||
| 33 | 2000-10-12 Kenichi Handa <handa@etl.go.jp> | 37 | 2000-10-12 Kenichi Handa <handa@etl.go.jp> |
| 34 | 38 | ||
| 35 | * startup.el (fancy-splash-text): Remove superfluous quote. | 39 | * 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 @@ | |||
| 36 | (require 'image) | 36 | (require 'image) |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | ;;;###autoload | ||
| 39 | (defcustom image-file-name-extensions | 40 | (defcustom image-file-name-extensions |
| 40 | '("png" "jpeg" "jpg" "gif" "tiff" "xbm" "xpm" "pbm") | 41 | '("png" "jpeg" "jpg" "gif" "tiff" "xbm" "xpm" "pbm") |
| 41 | "*A list of image-file filename extensions. | 42 | "*A list of image-file filename extensions. |
| @@ -55,6 +56,7 @@ variable is set using \\[customize]." | |||
| 55 | :initialize 'custom-initialize-default | 56 | :initialize 'custom-initialize-default |
| 56 | :group 'image) | 57 | :group 'image) |
| 57 | 58 | ||
| 59 | ;;;###autoload | ||
| 58 | (defcustom image-file-name-regexps nil | 60 | (defcustom image-file-name-regexps nil |
| 59 | "*List of regexps matching image-file filenames. | 61 | "*List of regexps matching image-file filenames. |
| 60 | Filenames matching one of these regexps are considered image files, | 62 | Filenames matching one of these regexps are considered image files, |