aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-10-05 09:00:38 +0000
committerJuanma Barranquero2007-10-05 09:00:38 +0000
commit4024ec3a26d62f7fd99f4868e6e02c225bd3347c (patch)
treed47e6d01f4911036155e6baf9961facf12a9fd79 /src
parentcb91e86ae525691cae9417e38b15d0f80be4ac91 (diff)
downloademacs-4024ec3a26d62f7fd99f4868e6e02c225bd3347c.tar.gz
emacs-4024ec3a26d62f7fd99f4868e6e02c225bd3347c.zip
(syms_of_image) <image-types>: Fix typo in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c12
2 files changed, 10 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eb45d47a8f4..656128832b6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
4 [USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap): 4 [USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap):
5 Add BLOCK_INPUT. 5 Add BLOCK_INPUT.
6 6
72007-10-04 Juanma Barranquero <lekktu@gmail.com>
8
9 * image.c (syms_of_image) <image-types>: Fix typo in docstring.
10
72007-10-02 Richard Stallman <rms@gnu.org> 112007-10-02 Richard Stallman <rms@gnu.org>
8 12
9 * xdisp.c (get_window_cursor_type): Implement documented behavior 13 * xdisp.c (get_window_cursor_type): Implement documented behavior
diff --git a/src/image.c b/src/image.c
index 1b024e5c1d5..28214642c3a 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1709,9 +1709,9 @@ free_image_cache (f)
1709/* Clear image cache of frame F. FORCE_P non-zero means free all 1709/* Clear image cache of frame F. FORCE_P non-zero means free all
1710 images. FORCE_P zero means clear only images that haven't been 1710 images. FORCE_P zero means clear only images that haven't been
1711 displayed for some time. Should be called from time to time to 1711 displayed for some time. Should be called from time to time to
1712 reduce the number of loaded images. If image-eviction-seconds is 1712 reduce the number of loaded images. If image-cache-eviction-delay
1713 non-nil, this frees images in the cache which weren't displayed for 1713 is non-nil, this frees images in the cache which weren't displayed
1714 at least that many seconds. */ 1714 for at least that many seconds. */
1715 1715
1716void 1716void
1717clear_image_cache (f, force_p) 1717clear_image_cache (f, force_p)
@@ -2878,7 +2878,7 @@ enum xbm_token
2878 3. a vector of strings or bool-vectors, one for each line of the 2878 3. a vector of strings or bool-vectors, one for each line of the
2879 bitmap. 2879 bitmap.
2880 2880
2881 4. A string containing an in-memory XBM file. WIDTH and HEIGHT 2881 4. a string containing an in-memory XBM file. WIDTH and HEIGHT
2882 may not be specified in this case because they are defined in the 2882 may not be specified in this case because they are defined in the
2883 XBM file. 2883 XBM file.
2884 2884
@@ -4275,7 +4275,7 @@ xpm_scan (s, end, beg, len)
4275 return XPM_TK_EOF; 4275 return XPM_TK_EOF;
4276} 4276}
4277 4277
4278/* Functions for color table lookup in XPM data. A Key is a string 4278/* Functions for color table lookup in XPM data. A key is a string
4279 specifying the color of each pixel in XPM data. A value is either 4279 specifying the color of each pixel in XPM data. A value is either
4280 an integer that specifies a pixel color, Qt that specifies 4280 an integer that specifies a pixel color, Qt that specifies
4281 transparency, or Qnil for the unspecified color. If the length of 4281 transparency, or Qnil for the unspecified color. If the length of
@@ -8620,7 +8620,7 @@ syms_of_image ()
8620 defining the supported image types. */ 8620 defining the supported image types. */
8621 DEFVAR_LISP ("image-types", &Vimage_types, 8621 DEFVAR_LISP ("image-types", &Vimage_types,
8622 doc: /* List of potentially supported image types. 8622 doc: /* List of potentially supported image types.
8623Each element of the list is a symbol for a image type, like 'jpeg or 'png. 8623Each element of the list is a symbol for an image type, like 'jpeg or 'png.
8624To check whether it is really supported, use `image-type-available-p'. */); 8624To check whether it is really supported, use `image-type-available-p'. */);
8625 Vimage_types = Qnil; 8625 Vimage_types = Qnil;
8626 8626