Merge: current_column: Now returns EMACS_INT, fixing some iftc

that was introduced in the 2002-06-02 change "temporarily"; see
<http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
* 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.

* minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here
from xdisp.c, and make static, since these are used only here.
* window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
Remove decls.
* xdisp.c (redisplay_window): Reindent to match Emacs style.

diff --cc src/ChangeLog
index 357bb9a37a82813e3ae6ac1a6f746dcdf0293b31,d0380e42e493be1d238c7ad9431ec9232da71a62..a96edcdfdca335374a21322c44f8aaf0a749348e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,6 -1,37 +1,39 @@@
  2011-03-06  Paul Eggert  <eggert@cs.ucla.edu>
  
 -      current_column: Now returns EMACS_INT, fixing some iftc.
++      current_column: Now returns EMACS_INT, fixing some iftc
++      that was introduced in the 2002-06-02 change "temporarily"; see
++      <http://lists.gnu.org/archive/html/emacs-devel/2002-06/msg00039.html>.
+       * 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.
+ 
+       * minibuf.c (minibuf_prompt, minibuf_prompt_width): Move here
+       from xdisp.c, and make static, since these are used only here.
+       * window.h, xdisp.c (minibuf_prompt, minibuf_prompt_width):
+       Remove decls.
+ 
        * cmds.c (internal_self_insert): Reindent to match Emacs style.
+       * xdisp.c (redisplay_window): Likewise.
  
        * xdisp.c: Rename or move local decls to avoid shadowing.
        (init_iterator, handle_fontified_prop, handle_single_display_spec):