diff options
| author | Tom Tromey <tromey@redhat.com> | 2011-01-18 10:55:46 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2011-01-18 10:55:46 -0700 |
| commit | 448c0820e46b5bf73c05677d5dcd8f3046e2ddf8 (patch) | |
| tree | bd01650d6c0fc32af196b4c772350d6ca49945c1 /src | |
| parent | 8442d95df1495762b1793ad160a5c52b89c531f9 (diff) | |
| download | emacs-448c0820e46b5bf73c05677d5dcd8f3046e2ddf8.tar.gz emacs-448c0820e46b5bf73c05677d5dcd8f3046e2ddf8.tar.bz2 emacs-448c0820e46b5bf73c05677d5dcd8f3046e2ddf8.zip | |
* image.c (Vimagemagick_render_type): Remove redundant
definition.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fc1e8054e13..a589db682b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2011-01-18 Tom Tromey <tromey@redhat.com> + * image.c (Vimagemagick_render_type): Remove redundant + definition. + +2011-01-18 Tom Tromey <tromey@redhat.com> + * xdisp.c (emacs_scroll_step): Rename from scroll_step. (try_scrolling): Rename argument to 'arg_scroll_conservatively'. (redisplay_window): Update. diff --git a/src/image.c b/src/image.c index 260e33c3cfb..53cbcd2071e 100644 --- a/src/image.c +++ b/src/image.c @@ -7380,7 +7380,6 @@ gif_load (struct frame *f, struct image *img) imagemagick ***********************************************************************/ #if defined (HAVE_IMAGEMAGICK) -Lisp_Object Vimagemagick_render_type; /* The symbol `imagemagick' identifying images of this type. */ |