mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-01 20:06:00 +00:00
(current_column): Now returns float.
(indented_beyond_p): 3rd arg now a float.
This commit is contained in:
parent
097812fb66
commit
e2c0561ec5
@ -1,3 +1,27 @@
|
||||
2002-06-02 Thien-Thi Nguyen <ttn@gnu.org>
|
||||
|
||||
* bytecode.c (Fbyte_code): Cast `current_column' return value to int.
|
||||
* cmds.c (Fdelete_backward_char, internal_self_insert): Likewise.
|
||||
* keymap.c (describe_command): Likewise.
|
||||
* minibuf.c (read_minibuf): Likewise.
|
||||
|
||||
* xdisp.c (redisplay_internal, redisplay_window, decode_mode_spec):
|
||||
Cast `current_column' return value to int.
|
||||
(back_to_previous_visible_line_start,
|
||||
reseat_at_next_visible_line_start, next_element_from_buffer):
|
||||
Cast `indented_beyond_p' 3rd arg to float.
|
||||
|
||||
* indent.c (last_known_column): Now a float.
|
||||
(current_column_1, position_indentation, current_column,
|
||||
string_display_width): Return float.
|
||||
(Fcurrent_column): Cast `current_column' return value to int.
|
||||
(Fcurrent_indentation): Cast `position_indentation' retval to int.
|
||||
(indented_beyond_p): Third arg now a float.
|
||||
(compute_motion, vmotion): Cast `indented_beyond_p' 3rd arg to float.
|
||||
|
||||
* lisp.h (current_column): Now returns float.
|
||||
(indented_beyond_p): 3rd arg now a float.
|
||||
|
||||
2002-05-31 Eli Zaretskii <eliz@is.elta.co.il>
|
||||
|
||||
* xfns.c (x_encode_text): Return stringp non-NULL if coding_system
|
||||
@ -57,7 +81,7 @@
|
||||
(substitute_object_recurse, substitute_object_in_subtree)
|
||||
(substitute_in_interval): Prototype.
|
||||
(read_multibyte): Return c if it's less than zero.
|
||||
|
||||
|
||||
2002-05-28 Kim F. Storm <storm@cua.dk>
|
||||
|
||||
* fileio.c (Fread_file_name_internal): Added brute-force
|
||||
@ -77,7 +101,7 @@
|
||||
Call Vread_file_name_function to read the file name if non-nil.
|
||||
|
||||
* lisp.h (Fread_file_name): Now has 6 args.
|
||||
|
||||
|
||||
* callint.c (Fcall_interactively) <"D">: Supply Qfile_directory_p
|
||||
predicate for Fread_file_name when reading directory name.
|
||||
Supply Qnil for predicate in other calls to Fread_file_name.
|
||||
@ -1036,8 +1060,8 @@
|
||||
* w32fns.c (x_set_cursor_color): Set foreground of cursor, not frame.
|
||||
(Fimage_size, Fimage_mask_p, XPutPixel): New functions.
|
||||
(four_corners_best, x_clear_image_1, x_clear_image)
|
||||
(x_alloc_image_color, postprocess_image)
|
||||
(x_create_x_image_and_pixmap, x_destroy_x_image, xbm_load_image)
|
||||
(x_alloc_image_color, postprocess_image)
|
||||
(x_create_x_image_and_pixmap, x_destroy_x_image, xbm_load_image)
|
||||
(x_from_x_colors, x_disable_image, pbm_load): Adapt for Windows.
|
||||
(init_xfns, syms_of_w32fns): Initialize image functions and constants.
|
||||
|
||||
@ -1052,7 +1076,7 @@
|
||||
socket functions.
|
||||
(socket_to_fd): New function.
|
||||
(sys_socket): Use it.
|
||||
(sys_setsockopt, sys_listen, sys_getsockname, sys_accept)
|
||||
(sys_setsockopt, sys_listen, sys_getsockname, sys_accept)
|
||||
(sys_recvfrom, sys_sendto): New wrapper functions.
|
||||
|
||||
* process.c (QCfamily, QCfilter): Remove duplicate declaration
|
||||
@ -1182,7 +1206,7 @@
|
||||
|
||||
2002-03-16 Richard M. Stallman <rms@gnu.org>
|
||||
|
||||
* xdisp.c (redisplay_internal, redisplay_windows):
|
||||
* xdisp.c (redisplay_internal, redisplay_windows):
|
||||
Use list_of_error to call internal_condition_case_1.
|
||||
(safe_eval, safe_call): Pass Qt to internal_condition_case_{1,2}
|
||||
so as to catch all errors with no possibility of debugger redisplay.
|
||||
|
32
src/lisp.h
32
src/lisp.h
@ -303,7 +303,7 @@ enum pvec_type
|
||||
PVEC_BUFFER = 0x20000,
|
||||
PVEC_HASH_TABLE = 0x40000,
|
||||
PVEC_TYPE_MASK = 0x7fe00
|
||||
|
||||
|
||||
#if 0 /* This is used to make the value of PSEUDOVECTOR_FLAG available to
|
||||
GDB. It doesn't work on OS Alpha. Moved to a variable in
|
||||
emacs.c. */
|
||||
@ -892,7 +892,7 @@ struct Lisp_Symbol
|
||||
|
||||
/* The symbol's property list. */
|
||||
Lisp_Object plist;
|
||||
|
||||
|
||||
/* Next symbol in obarray bucket, if the symbol is interned. */
|
||||
struct Lisp_Symbol *next;
|
||||
};
|
||||
@ -935,7 +935,7 @@ struct Lisp_Symbol
|
||||
else \
|
||||
XSYMBOL (sym)->value = (val); \
|
||||
} while (0)
|
||||
|
||||
|
||||
|
||||
/***********************************************************************
|
||||
Hash Tables
|
||||
@ -948,14 +948,14 @@ struct Lisp_Hash_Table
|
||||
/* Vector fields. The hash table code doesn't refer to these. */
|
||||
EMACS_INT size;
|
||||
struct Lisp_Vector *vec_next;
|
||||
|
||||
|
||||
/* Function used to compare keys. */
|
||||
Lisp_Object test;
|
||||
|
||||
/* Nil if table is non-weak. Otherwise a symbol describing the
|
||||
weakness of the table. */
|
||||
Lisp_Object weak;
|
||||
|
||||
|
||||
/* When the table is resized, and this is an integer, compute the
|
||||
new size by adding this to the old size. If a float, compute the
|
||||
new size by multiplying the old size with this factor. */
|
||||
@ -1127,7 +1127,7 @@ struct Lisp_Buffer_Objfwd
|
||||
one that corresponds to the loaded binding. To read or set the
|
||||
variable, you must first make sure the right binding is loaded;
|
||||
then you can access the value in (or through) `realvalue'.
|
||||
|
||||
|
||||
`buffer' and `frame' are the buffer and frame for which the loaded
|
||||
binding was found. If those have changed, to make sure the right
|
||||
binding is loaded it is necessary to find which binding goes with
|
||||
@ -1601,7 +1601,7 @@ typedef unsigned char UCHAR;
|
||||
|| (SYMBOLP (OBJ) && !NILP (Ffboundp (OBJ))) \
|
||||
|| COMPILEDP (OBJ) \
|
||||
|| SUBRP (OBJ))
|
||||
|
||||
|
||||
/* defsubr (Sname);
|
||||
is how we define the symbol for function `name' at start-up time. */
|
||||
extern void defsubr P_ ((struct Lisp_Subr *));
|
||||
@ -1646,9 +1646,9 @@ extern void defvar_kboard P_ ((char *, int));
|
||||
form.
|
||||
|
||||
Otherwise, the element is a variable binding.
|
||||
|
||||
|
||||
If the symbol field is a symbol, it is an ordinary variable binding.
|
||||
|
||||
|
||||
Otherwise, it should be a structure (SYMBOL WHERE
|
||||
. CURRENT-BUFFER), which means having bound a local value while
|
||||
CURRENT-BUFFER was active. If WHERE is nil this means we saw the
|
||||
@ -1797,13 +1797,13 @@ extern struct gcpro *gcprolist;
|
||||
struct gcpro
|
||||
{
|
||||
struct gcpro *next;
|
||||
|
||||
|
||||
/* Address of first protected variable. */
|
||||
volatile Lisp_Object *var;
|
||||
|
||||
|
||||
/* Number of consecutive protected variables. */
|
||||
int nvars;
|
||||
|
||||
|
||||
#ifdef DEBUG_GCPRO
|
||||
int level;
|
||||
#endif
|
||||
@ -1833,7 +1833,7 @@ struct gcpro
|
||||
/* Do something silly with gcproN vars just so gcc shuts up. */
|
||||
|
||||
#define GCPRO1(varname) ((void) gcpro1)
|
||||
#define GCPRO2(varname1, varname2)(((void) gcpro2, (void) gcpro1))
|
||||
#define GCPRO2(varname1, varname2)(((void) gcpro2, (void) gcpro1))
|
||||
#define GCPRO3(varname1, varname2, varname3) \
|
||||
(((void) gcpro3, (void) gcpro2, (void) gcpro1))
|
||||
#define GCPRO4(varname1, varname2, varname3, varname4) \
|
||||
@ -2807,9 +2807,9 @@ EXFUN (Fvertical_motion, 2);
|
||||
EXFUN (Findent_to, 2);
|
||||
EXFUN (Fcurrent_column, 0);
|
||||
EXFUN (Fmove_to_column, 2);
|
||||
extern int current_column P_ ((void));
|
||||
extern float current_column P_ ((void));
|
||||
extern void invalidate_current_column P_ ((void));
|
||||
extern int indented_beyond_p P_ ((int, int, int));
|
||||
extern int indented_beyond_p P_ ((int, int, float));
|
||||
extern void syms_of_indent P_ ((void));
|
||||
|
||||
/* defined in window.c */
|
||||
@ -3143,7 +3143,7 @@ extern Lisp_Object Vdirectory_sep_char;
|
||||
|
||||
/* Loop over Lisp list LIST. Signal an error if LIST is not a proper
|
||||
list, or if it contains circles.
|
||||
|
||||
|
||||
HARE and TORTOISE should be the names of Lisp_Object variables, and
|
||||
N should be the name of an EMACS_INT variable declared in the
|
||||
function where the macro is used. Each nested loop should use
|
||||
|
Loading…
x
Reference in New Issue
Block a user