diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-11-15 03:18:37 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-11-15 03:18:37 +0000 |
| commit | 308a660736c673a6596f980c382fca5187068978 (patch) | |
| tree | c661c0e1153bd7c54e0a8b1f227d2c583566997f | |
| parent | 12d944296e9102ad445ec3327220a01ba6eb8c8a (diff) | |
| download | emacs-308a660736c673a6596f980c382fca5187068978.tar.gz | |
(init_image) [MAC_OS]: Don't call EnterMovies if
inhibit_window_system is set.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 07ebb7a9e3f..86f710b87d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-11-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * image.c (init_image) [MAC_OS]: Don't call EnterMovies if + inhibit_window_system is set. + 2005-11-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * macgui.h (USE_CG_TEXT_DRAWING): New define. diff --git a/src/image.c b/src/image.c index 9dce2bf1cd1..08d2a9f9813 100644 --- a/src/image.c +++ b/src/image.c @@ -8458,7 +8458,8 @@ init_image () { #ifdef MAC_OS /* Animated gifs use QuickTime Movie Toolbox. So initialize it here. */ - EnterMovies (); + if (!inhibit_window_system) + EnterMovies (); #ifdef MAC_OSX init_image_func_pointer (); #endif |