aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-08-28 11:39:26 +0000
committerJuanma Barranquero2007-08-28 11:39:26 +0000
commit747c316eac34faf76dcd1bb05da3a09f415f292f (patch)
tree5c98a40cdf6d367c86400f5c0b719119cb02aa25
parent5f4a9ec610c5e9aa82c7a6fc03dc676ad4771a09 (diff)
downloademacs-747c316eac34faf76dcd1bb05da3a09f415f292f.tar.gz
emacs-747c316eac34faf76dcd1bb05da3a09f415f292f.zip
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/image.c10
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d73437c7dfc..68383a34cdd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12007-08-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * image.c (syms_of_image) <image-library-alist, cross-disabled-images>:
4 Doc fixes.
5
12007-08-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 62007-08-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 7
3 * gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED 8 * gtkutil.c (xg_tool_bar_expose_callback): Just do SET_FRAME_GARBAGED
diff --git a/src/image.c b/src/image.c
index a3cd3195217..91cb7eb570e 100644
--- a/src/image.c
+++ b/src/image.c
@@ -3103,7 +3103,8 @@ w32_create_pixmap_from_bitmap_data (int width, int height, char *data)
3103 return bmp; 3103 return bmp;
3104} 3104}
3105 3105
3106static void convert_mono_to_color_image (f, img, foreground, background) 3106static void
3107convert_mono_to_color_image (f, img, foreground, background)
3107 struct frame *f; 3108 struct frame *f;
3108 struct image *img; 3109 struct image *img;
3109 COLORREF foreground, background; 3110 COLORREF foreground, background;
@@ -5052,7 +5053,8 @@ x_to_xcolors (f, img, rgb_p)
5052 created with CreateDIBSection, with the pointer to the bit values 5053 created with CreateDIBSection, with the pointer to the bit values
5053 stored in ximg->data. */ 5054 stored in ximg->data. */
5054 5055
5055static void XPutPixel (ximg, x, y, color) 5056static void
5057XPutPixel (ximg, x, y, color)
5056 XImagePtr ximg; 5058 XImagePtr ximg;
5057 int x, y; 5059 int x, y;
5058 COLORREF color; 5060 COLORREF color;
@@ -8629,7 +8631,7 @@ alternate filenames for the corresponding external libraries.
8629Emacs tries to load the libraries in the order they appear on the 8631Emacs tries to load the libraries in the order they appear on the
8630list; if none is loaded, the running session of Emacs won't 8632list; if none is loaded, the running session of Emacs won't
8631support the image type. Types 'pbm and 'xbm don't need to be 8633support the image type. Types 'pbm and 'xbm don't need to be
8632listed; they're always supported. */); 8634listed; they are always supported. */);
8633 Vimage_library_alist = Qnil; 8635 Vimage_library_alist = Qnil;
8634 Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt); 8636 Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt);
8635 8637
@@ -8747,7 +8749,7 @@ non-numeric, there is no explicit limit on the size of images. */);
8747 8749
8748 DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images, 8750 DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,
8749 doc: /* Non-nil means always draw a cross over disabled images. 8751 doc: /* Non-nil means always draw a cross over disabled images.
8750Disabled images are those having an `:conversion disabled' property. 8752Disabled images are those having a `:conversion disabled' property.
8751A cross is always drawn on black & white displays. */); 8753A cross is always drawn on black & white displays. */);
8752 cross_disabled_images = 0; 8754 cross_disabled_images = 0;
8753 8755