diff options
| author | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-07-04 00:50:25 -0700 |
| commit | 971de7fb158335fbda39525feb2d7776a26bc030 (patch) | |
| tree | 605333d85f16e35bb06baffcb66ac49f4ec0dce9 /src/casetab.c | |
| parent | b8463cbfbe2c5183cf40772df2746e58b787ddeb (diff) | |
| download | emacs-971de7fb158335fbda39525feb2d7776a26bc030.tar.gz emacs-971de7fb158335fbda39525feb2d7776a26bc030.zip | |
Convert (most) functions in src to standard C.
* src/alloc.c: Convert function definitions to standard C.
* src/atimer.c:
* src/bidi.c:
* src/bytecode.c:
* src/callint.c:
* src/callproc.c:
* src/casefiddle.c:
* src/casetab.c:
* src/category.c:
* src/ccl.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/doprnt.c:
* src/ecrt0.c:
* src/editfns.c:
* src/fileio.c:
* src/filelock.c:
* src/filemode.c:
* src/fns.c:
* src/font.c:
* src/fontset.c:
* src/frame.c:
* src/fringe.c:
* src/ftfont.c:
* src/ftxfont.c:
* src/gtkutil.c:
* src/indent.c:
* src/insdel.c:
* src/intervals.c:
* src/keymap.c:
* src/lread.c:
* src/macros.c:
* src/marker.c:
* src/md5.c:
* src/menu.c:
* src/minibuf.c:
* src/prefix-args.c:
* src/print.c:
* src/ralloc.c:
* src/regex.c:
* src/region-cache.c:
* src/scroll.c:
* src/search.c:
* src/sound.c:
* src/strftime.c:
* src/syntax.c:
* src/sysdep.c:
* src/termcap.c:
* src/terminal.c:
* src/terminfo.c:
* src/textprop.c:
* src/tparam.c:
* src/undo.c:
* src/unexelf.c:
* src/window.c:
* src/xfaces.c:
* src/xfns.c:
* src/xfont.c:
* src/xftfont.c:
* src/xgselect.c:
* src/xmenu.c:
* src/xrdb.c:
* src/xselect.c:
* src/xsettings.c:
* src/xsmfns.c:
* src/xterm.c: Likewise.
Diffstat (limited to 'src/casetab.c')
| -rw-r--r-- | src/casetab.c | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/casetab.c b/src/casetab.c index e0a9ec49157..fc7e32e6462 100644 --- a/src/casetab.c +++ b/src/casetab.c | |||
| @@ -34,9 +34,9 @@ Lisp_Object Vascii_canon_table, Vascii_eqv_table; | |||
| 34 | int case_temp1; | 34 | int case_temp1; |
| 35 | Lisp_Object case_temp2; | 35 | Lisp_Object case_temp2; |
| 36 | 36 | ||
| 37 | static void set_canon (); | 37 | static void set_canon (Lisp_Object case_table, Lisp_Object range, Lisp_Object elt); |
| 38 | static void set_identity (); | 38 | static void set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt); |
| 39 | static void shuffle (); | 39 | static void shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt); |
| 40 | 40 | ||
| 41 | DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0, | 41 | DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0, |
| 42 | doc: /* Return t if OBJECT is a case table. | 42 | doc: /* Return t if OBJECT is a case table. |
| @@ -63,8 +63,7 @@ See `set-case-table' for more information on these data structures. */) | |||
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | static Lisp_Object | 65 | static Lisp_Object |
| 66 | check_case_table (obj) | 66 | check_case_table (Lisp_Object obj) |
| 67 | Lisp_Object obj; | ||
| 68 | { | 67 | { |
| 69 | CHECK_TYPE (!NILP (Fcase_table_p (obj)), Qcase_table_p, obj); | 68 | CHECK_TYPE (!NILP (Fcase_table_p (obj)), Qcase_table_p, obj); |
| 70 | return (obj); | 69 | return (obj); |
| @@ -85,7 +84,7 @@ This is the one used for new buffers. */) | |||
| 85 | return Vascii_downcase_table; | 84 | return Vascii_downcase_table; |
| 86 | } | 85 | } |
| 87 | 86 | ||
| 88 | static Lisp_Object set_case_table (); | 87 | static Lisp_Object set_case_table (Lisp_Object table, int standard); |
| 89 | 88 | ||
| 90 | DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0, | 89 | DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0, |
| 91 | doc: /* Select a new case table for the current buffer. | 90 | doc: /* Select a new case table for the current buffer. |
| @@ -120,9 +119,7 @@ See `set-case-table' for more info on case tables. */) | |||
| 120 | } | 119 | } |
| 121 | 120 | ||
| 122 | static Lisp_Object | 121 | static Lisp_Object |
| 123 | set_case_table (table, standard) | 122 | set_case_table (Lisp_Object table, int standard) |
| 124 | Lisp_Object table; | ||
| 125 | int standard; | ||
| 126 | { | 123 | { |
| 127 | Lisp_Object up, canon, eqv; | 124 | Lisp_Object up, canon, eqv; |
| 128 | 125 | ||
| @@ -184,8 +181,7 @@ set_case_table (table, standard) | |||
| 184 | CASE_TABLE. */ | 181 | CASE_TABLE. */ |
| 185 | 182 | ||
| 186 | static void | 183 | static void |
| 187 | set_canon (case_table, range, elt) | 184 | set_canon (Lisp_Object case_table, Lisp_Object range, Lisp_Object elt) |
| 188 | Lisp_Object case_table, range, elt; | ||
| 189 | { | 185 | { |
| 190 | Lisp_Object up = XCHAR_TABLE (case_table)->extras[0]; | 186 | Lisp_Object up = XCHAR_TABLE (case_table)->extras[0]; |
| 191 | Lisp_Object canon = XCHAR_TABLE (case_table)->extras[1]; | 187 | Lisp_Object canon = XCHAR_TABLE (case_table)->extras[1]; |
| @@ -200,8 +196,7 @@ set_canon (case_table, range, elt) | |||
| 200 | character. This is called in map_char_table. */ | 196 | character. This is called in map_char_table. */ |
| 201 | 197 | ||
| 202 | static void | 198 | static void |
| 203 | set_identity (table, c, elt) | 199 | set_identity (Lisp_Object table, Lisp_Object c, Lisp_Object elt) |
| 204 | Lisp_Object table, c, elt; | ||
| 205 | { | 200 | { |
| 206 | if (NATNUMP (elt)) | 201 | if (NATNUMP (elt)) |
| 207 | { | 202 | { |
| @@ -225,8 +220,7 @@ set_identity (table, c, elt) | |||
| 225 | operated. */ | 220 | operated. */ |
| 226 | 221 | ||
| 227 | static void | 222 | static void |
| 228 | shuffle (table, c, elt) | 223 | shuffle (Lisp_Object table, Lisp_Object c, Lisp_Object elt) |
| 229 | Lisp_Object table, c, elt; | ||
| 230 | { | 224 | { |
| 231 | if (NATNUMP (elt)) | 225 | if (NATNUMP (elt)) |
| 232 | { | 226 | { |
| @@ -250,7 +244,7 @@ shuffle (table, c, elt) | |||
| 250 | } | 244 | } |
| 251 | 245 | ||
| 252 | void | 246 | void |
| 253 | init_casetab_once () | 247 | init_casetab_once (void) |
| 254 | { | 248 | { |
| 255 | register int i; | 249 | register int i; |
| 256 | Lisp_Object down, up; | 250 | Lisp_Object down, up; |
| @@ -296,7 +290,7 @@ init_casetab_once () | |||
| 296 | } | 290 | } |
| 297 | 291 | ||
| 298 | void | 292 | void |
| 299 | syms_of_casetab () | 293 | syms_of_casetab (void) |
| 300 | { | 294 | { |
| 301 | Qcase_table_p = intern_c_string ("case-table-p"); | 295 | Qcase_table_p = intern_c_string ("case-table-p"); |
| 302 | staticpro (&Qcase_table_p); | 296 | staticpro (&Qcase_table_p); |