diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/image.el | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2c0e21af573..02a37833cad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2000-10-05 Miles Bader <miles@lsi.nec.co.jp> | 1 | 2000-10-05 Miles Bader <miles@lsi.nec.co.jp> |
| 2 | 2 | ||
| 3 | * image.el (image): New group. | ||
| 4 | |||
| 3 | * smerge-mode.el (smerge-mine-face, smerge-other-face) | 5 | * smerge-mode.el (smerge-mine-face, smerge-other-face) |
| 4 | (smerge-base-face, smerge-markers-face): Add dark-background variants. | 6 | (smerge-base-face, smerge-markers-face): Add dark-background variants. |
| 5 | 7 | ||
diff --git a/lisp/image.el b/lisp/image.el index 579d4d3f453..ce2857ddd0e 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -24,6 +24,12 @@ | |||
| 24 | 24 | ||
| 25 | ;;; Code: | 25 | ;;; Code: |
| 26 | 26 | ||
| 27 | |||
| 28 | (defgroup image () | ||
| 29 | "Image support." | ||
| 30 | :group 'multimedia) | ||
| 31 | |||
| 32 | |||
| 27 | (defconst image-type-regexps | 33 | (defconst image-type-regexps |
| 28 | '(("^/\\*.*XPM.\\*/" . xpm) | 34 | '(("^/\\*.*XPM.\\*/" . xpm) |
| 29 | ("^P[1-6]" . pbm) | 35 | ("^P[1-6]" . pbm) |