aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Tromey2011-01-18 10:55:46 -0700
committerTom Tromey2011-01-18 10:55:46 -0700
commit448c0820e46b5bf73c05677d5dcd8f3046e2ddf8 (patch)
treebd01650d6c0fc32af196b4c772350d6ca49945c1 /src
parent8442d95df1495762b1793ad160a5c52b89c531f9 (diff)
downloademacs-448c0820e46b5bf73c05677d5dcd8f3046e2ddf8.tar.gz
emacs-448c0820e46b5bf73c05677d5dcd8f3046e2ddf8.zip
* image.c (Vimagemagick_render_type): Remove redundant
definition.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/image.c1
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 @@
12011-01-18 Tom Tromey <tromey@redhat.com> 12011-01-18 Tom Tromey <tromey@redhat.com>
2 2
3 * image.c (Vimagemagick_render_type): Remove redundant
4 definition.
5
62011-01-18 Tom Tromey <tromey@redhat.com>
7
3 * xdisp.c (emacs_scroll_step): Rename from scroll_step. 8 * xdisp.c (emacs_scroll_step): Rename from scroll_step.
4 (try_scrolling): Rename argument to 'arg_scroll_conservatively'. 9 (try_scrolling): Rename argument to 'arg_scroll_conservatively'.
5 (redisplay_window): Update. 10 (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)
7380 imagemagick 7380 imagemagick
7381***********************************************************************/ 7381***********************************************************************/
7382#if defined (HAVE_IMAGEMAGICK) 7382#if defined (HAVE_IMAGEMAGICK)
7383Lisp_Object Vimagemagick_render_type;
7384 7383
7385/* The symbol `imagemagick' identifying images of this type. */ 7384/* The symbol `imagemagick' identifying images of this type. */
7386 7385