diff options
| author | Dan Nicolaescu | 2010-07-08 14:25:08 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-08 14:25:08 -0700 |
| commit | 5842a27bbfb7efa6872824e501bc7ec98b631553 (patch) | |
| tree | d173899af9cbed9d90d94cfc710e6ecc06dd1f6b /src/image.c | |
| parent | 71c44c04bb996abe77db8efd88255fde06532b10 (diff) | |
| download | emacs-5842a27bbfb7efa6872824e501bc7ec98b631553.tar.gz emacs-5842a27bbfb7efa6872824e501bc7ec98b631553.zip | |
Convert DEFUNs to standard C.
* src/alloc.c: Convert DEFUNs to standard C.
* src/buffer.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/character.c:
* src/charset.c:
* src/chartab.c:
* src/cmds.c:
* src/coding.c:
* src/composite.c:
* src/data.c:
* src/dbusbind.c:
* src/dired.c:
* src/dispnew.c:
* src/doc.c:
* src/dosfns.c:
* src/editfns.c:
* src/emacs.c:
* src/eval.c:
* src/fileio.c:
* src/filelock.c:
* src/floatfns.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/image.c:
* src/indent.c:
* src/insdel.c:
* src/keyboard.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/menu.c:
* src/minibuf.c:
* src/msdos.c:
* src/nsfns.m:
* src/nsmenu.m:
* src/nsselect.m:
* src/print.c:
* src/process.c:
* src/search.c:
* src/sound.c:
* src/syntax.c:
* src/term.c:
* src/terminal.c:
* src/textprop.c:
* src/undo.c:
* src/w16select.c:
* src/w32console.c:
* src/w32fns.c:
* src/w32font.c:
* src/w32menu.c:
* src/w32proc.c:
* src/w32select.c:
* src/window.c:
* src/xdisp.c:
* src/xfaces.c:
* src/xfns.c:
* src/xmenu.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c: Likewise.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/image.c b/src/image.c index 8d618b157b9..064278eebbc 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -926,8 +926,7 @@ PIXELS non-nil means return the size in pixels, otherwise return the | |||
| 926 | size in canonical character units. | 926 | size in canonical character units. |
| 927 | FRAME is the frame on which the image will be displayed. FRAME nil | 927 | FRAME is the frame on which the image will be displayed. FRAME nil |
| 928 | or omitted means use the selected frame. */) | 928 | or omitted means use the selected frame. */) |
| 929 | (spec, pixels, frame) | 929 | (Lisp_Object spec, Lisp_Object pixels, Lisp_Object frame) |
| 930 | Lisp_Object spec, pixels, frame; | ||
| 931 | { | 930 | { |
| 932 | Lisp_Object size; | 931 | Lisp_Object size; |
| 933 | 932 | ||
| @@ -957,8 +956,7 @@ DEFUN ("image-mask-p", Fimage_mask_p, Simage_mask_p, 1, 2, 0, | |||
| 957 | doc: /* Return t if image SPEC has a mask bitmap. | 956 | doc: /* Return t if image SPEC has a mask bitmap. |
| 958 | FRAME is the frame on which the image will be displayed. FRAME nil | 957 | FRAME is the frame on which the image will be displayed. FRAME nil |
| 959 | or omitted means use the selected frame. */) | 958 | or omitted means use the selected frame. */) |
| 960 | (spec, frame) | 959 | (Lisp_Object spec, Lisp_Object frame) |
| 961 | Lisp_Object spec, frame; | ||
| 962 | { | 960 | { |
| 963 | Lisp_Object mask; | 961 | Lisp_Object mask; |
| 964 | 962 | ||
| @@ -981,8 +979,7 @@ DEFUN ("image-metadata", Fimage_metadata, Simage_metadata, 1, 2, 0, | |||
| 981 | doc: /* Return metadata for image SPEC. | 979 | doc: /* Return metadata for image SPEC. |
| 982 | FRAME is the frame on which the image will be displayed. FRAME nil | 980 | FRAME is the frame on which the image will be displayed. FRAME nil |
| 983 | or omitted means use the selected frame. */) | 981 | or omitted means use the selected frame. */) |
| 984 | (spec, frame) | 982 | (Lisp_Object spec, Lisp_Object frame) |
| 985 | Lisp_Object spec, frame; | ||
| 986 | { | 983 | { |
| 987 | Lisp_Object ext; | 984 | Lisp_Object ext; |
| 988 | 985 | ||
| @@ -1610,8 +1607,7 @@ FILTER nil or a frame means clear all images in the selected frame. | |||
| 1610 | FILTER t means clear the image caches of all frames. | 1607 | FILTER t means clear the image caches of all frames. |
| 1611 | Anything else, means only clear those images which refer to FILTER, | 1608 | Anything else, means only clear those images which refer to FILTER, |
| 1612 | which is then usually a filename. */) | 1609 | which is then usually a filename. */) |
| 1613 | (filter) | 1610 | (Lisp_Object filter) |
| 1614 | Lisp_Object filter; | ||
| 1615 | { | 1611 | { |
| 1616 | if (!(EQ (filter, Qnil) || FRAMEP (filter))) | 1612 | if (!(EQ (filter, Qnil) || FRAMEP (filter))) |
| 1617 | clear_image_caches (filter); | 1613 | clear_image_caches (filter); |
| @@ -1631,8 +1627,7 @@ current contents of that file. | |||
| 1631 | 1627 | ||
| 1632 | FRAME nil or omitted means use the selected frame. | 1628 | FRAME nil or omitted means use the selected frame. |
| 1633 | FRAME t means refresh the image on all frames. */) | 1629 | FRAME t means refresh the image on all frames. */) |
| 1634 | (spec, frame) | 1630 | (Lisp_Object spec, Lisp_Object frame) |
| 1635 | Lisp_Object spec, frame; | ||
| 1636 | { | 1631 | { |
| 1637 | if (!valid_image_p (spec)) | 1632 | if (!valid_image_p (spec)) |
| 1638 | error ("Invalid image specification"); | 1633 | error ("Invalid image specification"); |
| @@ -8049,16 +8044,14 @@ x_kill_gs_process (Pixmap pixmap, struct frame *f) | |||
| 8049 | 8044 | ||
| 8050 | DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0, | 8045 | DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0, |
| 8051 | doc: /* Value is non-nil if SPEC is a valid image specification. */) | 8046 | doc: /* Value is non-nil if SPEC is a valid image specification. */) |
| 8052 | (spec) | 8047 | (Lisp_Object spec) |
| 8053 | Lisp_Object spec; | ||
| 8054 | { | 8048 | { |
| 8055 | return valid_image_p (spec) ? Qt : Qnil; | 8049 | return valid_image_p (spec) ? Qt : Qnil; |
| 8056 | } | 8050 | } |
| 8057 | 8051 | ||
| 8058 | 8052 | ||
| 8059 | DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "") | 8053 | DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "") |
| 8060 | (spec) | 8054 | (Lisp_Object spec) |
| 8061 | Lisp_Object spec; | ||
| 8062 | { | 8055 | { |
| 8063 | int id = -1; | 8056 | int id = -1; |
| 8064 | 8057 | ||
| @@ -8093,8 +8086,7 @@ Return non-nil if TYPE is a supported image type. | |||
| 8093 | Image types pbm and xbm are prebuilt; other types are loaded here. | 8086 | Image types pbm and xbm are prebuilt; other types are loaded here. |
| 8094 | Libraries to load are specified in alist LIBRARIES (usually, the value | 8087 | Libraries to load are specified in alist LIBRARIES (usually, the value |
| 8095 | of `image-library-alist', which see). */) | 8088 | of `image-library-alist', which see). */) |
| 8096 | (type, libraries) | 8089 | (Lisp_Object type, Lisp_Object libraries) |
| 8097 | Lisp_Object type, libraries; | ||
| 8098 | { | 8090 | { |
| 8099 | Lisp_Object tested; | 8091 | Lisp_Object tested; |
| 8100 | 8092 | ||