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/fontset.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/fontset.c')
| -rw-r--r-- | src/fontset.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/fontset.c b/src/fontset.c index 01c62000ca0..676e96fd88c 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -1186,8 +1186,7 @@ The value is nil if there is no matching fontset. | |||
| 1186 | PATTERN can contain `*' or `?' as a wildcard | 1186 | PATTERN can contain `*' or `?' as a wildcard |
| 1187 | just as X font name matching algorithm allows. | 1187 | just as X font name matching algorithm allows. |
| 1188 | If REGEXPP is non-nil, PATTERN is a regular expression. */) | 1188 | If REGEXPP is non-nil, PATTERN is a regular expression. */) |
| 1189 | (pattern, regexpp) | 1189 | (Lisp_Object pattern, Lisp_Object regexpp) |
| 1190 | Lisp_Object pattern, regexpp; | ||
| 1191 | { | 1190 | { |
| 1192 | Lisp_Object fontset; | 1191 | Lisp_Object fontset; |
| 1193 | int id; | 1192 | int id; |
| @@ -1435,8 +1434,7 @@ Optional 5th argument ADD, if non-nil, specifies how to add FONT-SPEC | |||
| 1435 | to the font specifications for TARGET previously set. If it is | 1434 | to the font specifications for TARGET previously set. If it is |
| 1436 | `prepend', FONT-SPEC is prepended. If it is `append', FONT-SPEC is | 1435 | `prepend', FONT-SPEC is prepended. If it is `append', FONT-SPEC is |
| 1437 | appended. By default, FONT-SPEC overrides the previous settings. */) | 1436 | appended. By default, FONT-SPEC overrides the previous settings. */) |
| 1438 | (name, target, font_spec, frame, add) | 1437 | (Lisp_Object name, Lisp_Object target, Lisp_Object font_spec, Lisp_Object frame, Lisp_Object add) |
| 1439 | Lisp_Object name, target, font_spec, frame, add; | ||
| 1440 | { | 1438 | { |
| 1441 | Lisp_Object fontset; | 1439 | Lisp_Object fontset; |
| 1442 | Lisp_Object font_def, registry, family; | 1440 | Lisp_Object font_def, registry, family; |
| @@ -1645,8 +1643,7 @@ char-table `char-script-table'. | |||
| 1645 | 1643 | ||
| 1646 | FONT-SPEC is a vector, a cons, or a string. See the documentation of | 1644 | FONT-SPEC is a vector, a cons, or a string. See the documentation of |
| 1647 | `set-fontset-font' for the meaning. */) | 1645 | `set-fontset-font' for the meaning. */) |
| 1648 | (name, fontlist) | 1646 | (Lisp_Object name, Lisp_Object fontlist) |
| 1649 | Lisp_Object name, fontlist; | ||
| 1650 | { | 1647 | { |
| 1651 | Lisp_Object fontset; | 1648 | Lisp_Object fontset; |
| 1652 | int id; | 1649 | int id; |
| @@ -1821,8 +1818,7 @@ update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) | |||
| 1821 | 1818 | ||
| 1822 | DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, | 1819 | DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, |
| 1823 | doc: /* For internal use only. */) | 1820 | doc: /* For internal use only. */) |
| 1824 | (position, ch) | 1821 | (Lisp_Object position, Lisp_Object ch) |
| 1825 | Lisp_Object position, ch; | ||
| 1826 | { | 1822 | { |
| 1827 | EMACS_INT pos, pos_byte, dummy; | 1823 | EMACS_INT pos, pos_byte, dummy; |
| 1828 | int face_id; | 1824 | int face_id; |
| @@ -1912,8 +1908,7 @@ The char-table has one extra slot. If FONTSET is not the default | |||
| 1912 | fontset, the value the extra slot is a char-table containing the | 1908 | fontset, the value the extra slot is a char-table containing the |
| 1913 | information about the derived fonts from the default fontset. The | 1909 | information about the derived fonts from the default fontset. The |
| 1914 | format is the same as above. */) | 1910 | format is the same as above. */) |
| 1915 | (fontset, frame) | 1911 | (Lisp_Object fontset, Lisp_Object frame) |
| 1916 | Lisp_Object fontset, frame; | ||
| 1917 | { | 1912 | { |
| 1918 | FRAME_PTR f; | 1913 | FRAME_PTR f; |
| 1919 | Lisp_Object *realized[2], fontsets[2], tables[2]; | 1914 | Lisp_Object *realized[2], fontsets[2], tables[2]; |
| @@ -2048,8 +2043,7 @@ fontset. | |||
| 2048 | 2043 | ||
| 2049 | If the 2nd optional arg ALL is non-nil, return a list of all font name | 2044 | If the 2nd optional arg ALL is non-nil, return a list of all font name |
| 2050 | patterns. */) | 2045 | patterns. */) |
| 2051 | (name, ch, all) | 2046 | (Lisp_Object name, Lisp_Object ch, Lisp_Object all) |
| 2052 | Lisp_Object name, ch, all; | ||
| 2053 | { | 2047 | { |
| 2054 | int c; | 2048 | int c; |
| 2055 | Lisp_Object fontset, elt, list, repertory, val; | 2049 | Lisp_Object fontset, elt, list, repertory, val; |
| @@ -2109,7 +2103,7 @@ patterns. */) | |||
| 2109 | 2103 | ||
| 2110 | DEFUN ("fontset-list", Ffontset_list, Sfontset_list, 0, 0, 0, | 2104 | DEFUN ("fontset-list", Ffontset_list, Sfontset_list, 0, 0, 0, |
| 2111 | doc: /* Return a list of all defined fontset names. */) | 2105 | doc: /* Return a list of all defined fontset names. */) |
| 2112 | () | 2106 | (void) |
| 2113 | { | 2107 | { |
| 2114 | Lisp_Object fontset, list; | 2108 | Lisp_Object fontset, list; |
| 2115 | int i; | 2109 | int i; |
| @@ -2166,7 +2160,7 @@ dump_fontset (fontset) | |||
| 2166 | 2160 | ||
| 2167 | DEFUN ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0, | 2161 | DEFUN ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0, |
| 2168 | doc: /* Return a brief summary of all fontsets for debug use. */) | 2162 | doc: /* Return a brief summary of all fontsets for debug use. */) |
| 2169 | () | 2163 | (void) |
| 2170 | { | 2164 | { |
| 2171 | Lisp_Object val; | 2165 | Lisp_Object val; |
| 2172 | int i; | 2166 | int i; |