diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-06 02:27:06 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-03-06 02:27:06 -0800 |
| commit | 7831777b8a9e8d2f68bd17058359ea8849d66f70 (patch) | |
| tree | 633cc6fdd638927360ff83619a32def87ed02b4c /src/minibuf.c | |
| parent | 179b8720a2e5c37d18ab8f601b982fdcabd19626 (diff) | |
| download | emacs-7831777b8a9e8d2f68bd17058359ea8849d66f70.tar.gz | |
current_column: Now returns EMACS_INT, fixing some iftc.
* bytecode.c (Fbyte_code): Don't cast current_column () to int.
* cmds.c (internal_self_insert): Likewise.
* indent.c (Fcurrent_column): Likewise.
* keymap.c (describe_command): Likewise.
* minibuf.c (read_minibuf): Likewise.
* indent.c (Fcurrent_indentation): Don't cast position_indentation ()
to int.
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
Likewise.
* cmds.c (internal_self_insert): Declare locals to be EMACS_INT,
not int or double, if they might contain a column number.
* indent.c (current_column, Findent_to, indented_beyond_p):
(compute_motion, vmotion): Likewise.
* keymap.c (describe_command): Likewise.
* xdisp.c (pint2str): Likewise.
* indent.c (last_known_column): Now EMACS_INT, not int.
* minibuf.c (minibuf_prompt_width): Likewise.
* indent.c (current_column, current_column_1, position_indentation):
Return EMACS_INT, not double.
* lisp.h (current_column): Likewise.
* indent.c (indented_beyond_p): Last arg is now EMACS_INT, not double.
All callers changed.
* lisp.h (indented_beyond_p): Likewise.
Diffstat (limited to 'src/minibuf.c')
| -rw-r--r-- | src/minibuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/minibuf.c b/src/minibuf.c index a56ed679a51..83587b53b73 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -89,7 +89,7 @@ static Lisp_Object minibuf_prompt; /* Width of current mini-buffer prompt. Only set after display_line of the line that contains the prompt. */ -static int minibuf_prompt_width; +static EMACS_INT minibuf_prompt_width; /* Put minibuf on currently selected frame's minibuffer. @@ -632,7 +632,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, unbind_to (count1, Qnil); } - minibuf_prompt_width = (int) current_column (); /* iftc */ + minibuf_prompt_width = current_column (); /* Put in the initial input. */ if (!NILP (initial)) |