From f57e2426f0e8a6b251be71b6f62237fd286998ea Mon Sep 17 00:00:00 2001 From: Jan D Date: Fri, 2 Jul 2010 14:19:53 +0200 Subject: Remove __P and P_ from .c and .m files and definition of P_ * lisp.h: * atimer.h: Remove define for P_. * alloc.c: Remove __P and P_ from .c and .m files. * atimer.c: * buffer.c: * callint.c: * category.c: * charset.c: * chartab.c: * cm.c: * coding.c: * composite.c: * data.c: * dired.c: * dispnew.c: * doc.c: * editfns.c: * emacs.c: * eval.c: * fileio.c: * filelock.c: * fns.c: * font.c: * fontset.c: * frame.c: * ftfont.c: * ftxfont.c: * gmalloc.c: * gtkutil.c: * image.c: * indent.c: * intervals.c: * keyboard.c: * keymap.c: * lread.c: * marker.c: * menu.c: * minibuf.c: * print.c: * process.c: * scroll.c: * search.c: * sound.c: * strftime.c: * syntax.c: * sysdep.c: * term.c: * terminal.c: * textprop.c: * unexalpha.c: * w32console.c: * w32fns.c: * w32font.c: * w32menu.c: * w32term.c: * w32uniscribe.c: * window.c: * xdisp.c: * xfaces.c: * xfns.c: * xfont.c: * xftfont.c: * xmenu.c: * xselect.c: * xterm.c: Likewise. * ebrowse.c: Remove P_ and __P. * etags.c: * movemail.c: * pop.c: * update-game-score.c: Likewise. --- src/buffer.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 589266f40e5..0dfad93b3e7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -106,13 +106,13 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; int last_per_buffer_idx; EXFUN (Fset_buffer, 1); -void set_buffer_internal P_ ((struct buffer *b)); -void set_buffer_internal_1 P_ ((struct buffer *b)); -static void call_overlay_mod_hooks P_ ((Lisp_Object list, Lisp_Object overlay, - int after, Lisp_Object arg1, - Lisp_Object arg2, Lisp_Object arg3)); -static void swap_out_buffer_local_variables P_ ((struct buffer *b)); -static void reset_buffer_local_variables P_ ((struct buffer *b, int permanent_too)); +void set_buffer_internal (struct buffer *b); +void set_buffer_internal_1 (struct buffer *b); +static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, + int after, Lisp_Object arg1, + Lisp_Object arg2, Lisp_Object arg3); +static void swap_out_buffer_local_variables (struct buffer *b); +static void reset_buffer_local_variables (struct buffer *b, int permanent_too); /* Alist of all buffer names vs the buffers. */ /* This used to be a variable, but is no longer, @@ -168,13 +168,13 @@ Lisp_Object Qmodification_hooks; Lisp_Object Qinsert_in_front_hooks; Lisp_Object Qinsert_behind_hooks; -static void alloc_buffer_text P_ ((struct buffer *, size_t)); -static void free_buffer_text P_ ((struct buffer *b)); -static struct Lisp_Overlay * copy_overlays P_ ((struct buffer *, struct Lisp_Overlay *)); -static void modify_overlay P_ ((struct buffer *, EMACS_INT, EMACS_INT)); -static Lisp_Object buffer_lisp_local_variables P_ ((struct buffer *)); +static void alloc_buffer_text (struct buffer *, size_t); +static void free_buffer_text (struct buffer *b); +static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay *); +static void modify_overlay (struct buffer *, EMACS_INT, EMACS_INT); +static Lisp_Object buffer_lisp_local_variables (struct buffer *); -extern char * emacs_strerror P_ ((int)); +extern char * emacs_strerror (int); /* For debugging; temporary. See set_buffer_internal. */ /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ @@ -2175,7 +2175,7 @@ advance_to_char_boundary (byte_pos) } #ifdef REL_ALLOC -extern void r_alloc_reset_variable P_ ((POINTER_TYPE *, POINTER_TYPE *)); +extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *); #endif /* REL_ALLOC */ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, @@ -4693,13 +4693,13 @@ static int mmap_initialized_p; /* Function prototypes. */ -static int mmap_free_1 P_ ((struct mmap_region *)); -static int mmap_enlarge P_ ((struct mmap_region *, int)); -static struct mmap_region *mmap_find P_ ((POINTER_TYPE *, POINTER_TYPE *)); -static POINTER_TYPE *mmap_alloc P_ ((POINTER_TYPE **, size_t)); -static POINTER_TYPE *mmap_realloc P_ ((POINTER_TYPE **, size_t)); -static void mmap_free P_ ((POINTER_TYPE **ptr)); -static void mmap_init P_ ((void)); +static int mmap_free_1 (struct mmap_region *); +static int mmap_enlarge (struct mmap_region *, int); +static struct mmap_region *mmap_find (POINTER_TYPE *, POINTER_TYPE *); +static POINTER_TYPE *mmap_alloc (POINTER_TYPE **, size_t); +static POINTER_TYPE *mmap_realloc (POINTER_TYPE **, size_t); +static void mmap_free (POINTER_TYPE **ptr); +static void mmap_init (void); /* Return a region overlapping address range START...END, or null if @@ -5032,9 +5032,9 @@ mmap_init () ***********************************************************************/ #ifdef REL_ALLOC -extern POINTER_TYPE *r_alloc P_ ((POINTER_TYPE **, size_t)); -extern POINTER_TYPE *r_re_alloc P_ ((POINTER_TYPE **, size_t)); -extern void r_alloc_free P_ ((POINTER_TYPE **ptr)); +extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t); +extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t); +extern void r_alloc_free (POINTER_TYPE **ptr); #endif /* REL_ALLOC */ -- cgit v1.2.1 From d3da34e0dab1404e80dba5413b3c449a6ea8fa0c Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 5 Jul 2010 12:36:06 +0200 Subject: Convert most remaining function definitions to standard C. * buffer.c, cm.c, eval.c, keyboard.c, process.c, term.c, vm-limit.c, * xdisp.c: Convert function definitions to standard C. * cm.c (cmputc): Arg C is now int, not char. * process.c (Fmake_network_process): Cast sockaddr_in* to sockaddr*. --- src/buffer.c | 178 ++++++++++++++++++----------------------------------------- 1 file changed, 53 insertions(+), 125 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 0dfad93b3e7..57e4986a0bb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -180,8 +180,7 @@ extern char * emacs_strerror (int); /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ void -nsberror (spec) - Lisp_Object spec; +nsberror (Lisp_Object spec) { if (STRINGP (spec)) error ("No buffer named %s", SDATA (spec)); @@ -248,9 +247,7 @@ frame parameter come first, followed by the rest of the buffers. */) and don't ever QUIT. */ static Lisp_Object -assoc_ignore_text_properties (key, list) - register Lisp_Object key; - Lisp_Object list; +assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list) { register Lisp_Object tail; for (tail = list; CONSP (tail); tail = XCDR (tail)) @@ -312,8 +309,7 @@ See also `find-buffer-visiting'. */) } Lisp_Object -get_truename_buffer (filename) - register Lisp_Object filename; +get_truename_buffer (register Lisp_Object filename) { register Lisp_Object tail, buf, tem; @@ -437,9 +433,7 @@ even if it is dead. The return value is never nil. */) LIST, but for buffer B. */ static struct Lisp_Overlay * -copy_overlays (b, list) - struct buffer *b; - struct Lisp_Overlay *list; +copy_overlays (struct buffer *b, struct Lisp_Overlay *list) { Lisp_Object buffer; struct Lisp_Overlay *result = NULL, *tail = NULL; @@ -489,8 +483,7 @@ copy_overlays (b, list) copied. */ static void -clone_per_buffer_values (from, to) - struct buffer *from, *to; +clone_per_buffer_values (struct buffer *from, struct buffer *to) { Lisp_Object to_buffer; int offset; @@ -658,8 +651,7 @@ CLONE nil means the indirect buffer's state is reset to default values. */) } void -delete_all_overlays (b) - struct buffer *b; +delete_all_overlays (struct buffer *b) { Lisp_Object overlay; @@ -689,8 +681,7 @@ delete_all_overlays (b) claims it doesn't belong to it. */ void -reset_buffer (b) - register struct buffer *b; +reset_buffer (register struct buffer *b) { b->filename = Qnil; b->file_truename = Qnil; @@ -734,9 +725,7 @@ reset_buffer (b) we preserve those. */ static void -reset_buffer_local_variables (b, permanent_too) - register struct buffer *b; - int permanent_too; +reset_buffer_local_variables (register struct buffer *b, int permanent_too) { register int offset; int i; @@ -993,8 +982,7 @@ is the default binding of the variable. */) in special slots in the buffer object. */ static Lisp_Object -buffer_lisp_local_variables (buf) - struct buffer *buf; +buffer_lisp_local_variables (struct buffer *buf) { Lisp_Object result = Qnil; register Lisp_Object tail; @@ -1293,7 +1281,7 @@ If BUFFER is omitted or nil, some interesting buffer is returned. */) (buffer, visible_ok, frame) register Lisp_Object buffer, visible_ok, frame; { - Lisp_Object Fset_buffer_major_mode (); + Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer); register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; notsogood = Qnil; @@ -1618,8 +1606,7 @@ with SIGHUP. */) means that other_buffer is more likely to choose a relevant buffer. */ void -record_buffer (buf) - Lisp_Object buf; +record_buffer (Lisp_Object buf) { register Lisp_Object link, prev; Lisp_Object frame; @@ -1734,8 +1721,7 @@ the current buffer's major mode. */) If NORECORD is non-nil, don't call record_buffer. */ Lisp_Object -switch_to_buffer_1 (buffer_or_name, norecord) - Lisp_Object buffer_or_name, norecord; +switch_to_buffer_1 (Lisp_Object buffer_or_name, Lisp_Object norecord) { register Lisp_Object buffer; @@ -1831,8 +1817,7 @@ DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, time, and that increments windows_or_buffers_changed. */ void -set_buffer_internal (b) - register struct buffer *b; +set_buffer_internal (register struct buffer *b) { if (current_buffer != b) set_buffer_internal_1 (b); @@ -1842,8 +1827,7 @@ set_buffer_internal (b) This is used by redisplay. */ void -set_buffer_internal_1 (b) - register struct buffer *b; +set_buffer_internal_1 (register struct buffer *b) { register struct buffer *old_buf; register Lisp_Object tail; @@ -1939,8 +1923,7 @@ set_buffer_internal_1 (b) This avoids certain things that don't need to be done within redisplay. */ void -set_buffer_temp (b) - struct buffer *b; +set_buffer_temp (struct buffer *b) { register struct buffer *old_buf; @@ -2019,8 +2002,7 @@ ends when the current command terminates. Use `switch-to-buffer' or /* Set the current buffer to BUFFER provided it is alive. */ Lisp_Object -set_buffer_if_live (buffer) - Lisp_Object buffer; +set_buffer_if_live (Lisp_Object buffer) { if (! NILP (XBUFFER (buffer)->name)) Fset_buffer (buffer); @@ -2120,8 +2102,7 @@ so the buffer is truly empty after this. */) } void -validate_region (b, e) - register Lisp_Object *b, *e; +validate_region (register Lisp_Object *b, register Lisp_Object *e) { CHECK_NUMBER_COERCE_MARKER (*b); CHECK_NUMBER_COERCE_MARKER (*e); @@ -2141,8 +2122,7 @@ validate_region (b, e) and return the adjusted position. */ static int -advance_to_char_boundary (byte_pos) - int byte_pos; +advance_to_char_boundary (int byte_pos) { int c; @@ -2644,8 +2624,7 @@ the normal hook `change-major-mode-hook'. */) for their current values. */ static void -swap_out_buffer_local_variables (b) - struct buffer *b; +swap_out_buffer_local_variables (struct buffer *b) { Lisp_Object oalist, alist, buffer; @@ -2690,14 +2669,8 @@ swap_out_buffer_local_variables (b) default (BEGV or ZV). */ int -overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr, change_req) - EMACS_INT pos; - int extend; - Lisp_Object **vec_ptr; - int *len_ptr; - EMACS_INT *next_ptr; - EMACS_INT *prev_ptr; - int change_req; +overlays_at (EMACS_INT pos, int extend, Lisp_Object **vec_ptr, int *len_ptr, + EMACS_INT *next_ptr, EMACS_INT *prev_ptr, int change_req) { Lisp_Object overlay, start, end; struct Lisp_Overlay *tail; @@ -2835,13 +2808,8 @@ overlays_at (pos, extend, vec_ptr, len_ptr, next_ptr, prev_ptr, change_req) But we still return the total number of overlays. */ static int -overlays_in (beg, end, extend, vec_ptr, len_ptr, next_ptr, prev_ptr) - int beg, end; - int extend; - Lisp_Object **vec_ptr; - int *len_ptr; - int *next_ptr; - int *prev_ptr; +overlays_in (int beg, int end, int extend, Lisp_Object **vec_ptr, int *len_ptr, + int *next_ptr, int *prev_ptr) { Lisp_Object overlay, ostart, oend; struct Lisp_Overlay *tail; @@ -2962,8 +2930,7 @@ overlays_in (beg, end, extend, vec_ptr, len_ptr, next_ptr, prev_ptr) `mouse-face' property overlapping OVERLAY. */ int -mouse_face_overlay_overlaps (overlay) - Lisp_Object overlay; +mouse_face_overlay_overlaps (Lisp_Object overlay) { int start = OVERLAY_POSITION (OVERLAY_START (overlay)); int end = OVERLAY_POSITION (OVERLAY_END (overlay)); @@ -2992,8 +2959,7 @@ mouse_face_overlay_overlaps (overlay) /* Fast function to just test if we're at an overlay boundary. */ int -overlay_touches_p (pos) - int pos; +overlay_touches_p (int pos) { Lisp_Object overlay; struct Lisp_Overlay *tail; @@ -3038,8 +3004,7 @@ struct sortvec }; static int -compare_overlays (v1, v2) - const void *v1, *v2; +compare_overlays (const void *v1, const void *v2) { const struct sortvec *s1 = (const struct sortvec *) v1; const struct sortvec *s2 = (const struct sortvec *) v2; @@ -3056,10 +3021,7 @@ compare_overlays (v1, v2) The return value is the new size; this may be smaller than the original size if some of the overlays were invalid or were window-specific. */ int -sort_overlays (overlay_vec, noverlays, w) - Lisp_Object *overlay_vec; - int noverlays; - struct window *w; +sort_overlays (Lisp_Object *overlay_vec, int noverlays, struct window *w) { int i, j; struct sortvec *sortvec; @@ -3139,8 +3101,7 @@ static int overlay_str_len; /* A comparison function suitable for passing to qsort. */ static int -cmp_for_strings (as1, as2) - char *as1, *as2; +cmp_for_strings (const void *as1, const void *as2) { struct sortstr *s1 = (struct sortstr *)as1; struct sortstr *s2 = (struct sortstr *)as2; @@ -3152,10 +3113,7 @@ cmp_for_strings (as1, as2) } static void -record_overlay_string (ssl, str, str2, pri, size) - struct sortstrlist *ssl; - Lisp_Object str, str2, pri; - int size; +record_overlay_string (struct sortstrlist *ssl, Lisp_Object str, Lisp_Object str2, Lisp_Object pri, int size) { int nbytes; @@ -3211,10 +3169,7 @@ record_overlay_string (ssl, str, str2, pri, size) subsequent calls. */ int -overlay_strings (pos, w, pstr) - EMACS_INT pos; - struct window *w; - unsigned char **pstr; +overlay_strings (EMACS_INT pos, struct window *w, unsigned char **pstr) { Lisp_Object overlay, window, str; struct Lisp_Overlay *ov; @@ -3337,9 +3292,7 @@ overlay_strings (pos, w, pstr) /* Shift overlays in BUF's overlay lists, to center the lists at POS. */ void -recenter_overlay_lists (buf, pos) - struct buffer *buf; - EMACS_INT pos; +recenter_overlay_lists (struct buffer *buf, EMACS_INT pos) { Lisp_Object overlay, beg, end; struct Lisp_Overlay *prev, *tail, *next; @@ -3488,9 +3441,7 @@ recenter_overlay_lists (buf, pos) } void -adjust_overlays_for_insert (pos, length) - EMACS_INT pos; - EMACS_INT length; +adjust_overlays_for_insert (EMACS_INT pos, EMACS_INT length) { /* After an insertion, the lists are still sorted properly, but we may need to update the value of the overlay center. */ @@ -3499,9 +3450,7 @@ adjust_overlays_for_insert (pos, length) } void -adjust_overlays_for_delete (pos, length) - EMACS_INT pos; - EMACS_INT length; +adjust_overlays_for_delete (EMACS_INT pos, EMACS_INT length) { if (current_buffer->overlay_center < pos) /* The deletion was to our right. No change needed; the before- and @@ -3526,8 +3475,7 @@ adjust_overlays_for_delete (pos, length) Such an overlay might even have negative size at this point. If so, we'll make the overlay empty. */ void -fix_start_end_in_overlays (start, end) - register int start, end; +fix_start_end_in_overlays (register int start, register int end) { Lisp_Object overlay; struct Lisp_Overlay *before_list, *after_list; @@ -3673,9 +3621,7 @@ fix_start_end_in_overlays (start, end) was at PREV, and now is at POS. */ void -fix_overlays_before (bp, prev, pos) - struct buffer *bp; - EMACS_INT prev, pos; +fix_overlays_before (struct buffer *bp, EMACS_INT prev, EMACS_INT pos) { /* If parent is nil, replace overlays_before; otherwise, parent->next. */ struct Lisp_Overlay *tail = bp->overlays_before, *parent = NULL, *right_pair; @@ -3841,9 +3787,7 @@ for the rear of the overlay advance when text is inserted there /* Mark a section of BUF as needing redisplay because of overlays changes. */ static void -modify_overlay (buf, start, end) - struct buffer *buf; - EMACS_INT start, end; +modify_overlay (struct buffer *buf, EMACS_INT start, EMACS_INT end) { if (start > end) { @@ -3870,11 +3814,10 @@ modify_overlay (buf, start, end) } -Lisp_Object Fdelete_overlay (); +Lisp_Object Fdelete_overlay (Lisp_Object overlay); static struct Lisp_Overlay * -unchain_overlay (list, overlay) - struct Lisp_Overlay *list, *overlay; +unchain_overlay (struct Lisp_Overlay *list, struct Lisp_Overlay *overlay) { struct Lisp_Overlay *tmp, *prev; for (tmp = list, prev = NULL; tmp; prev = tmp, tmp = tmp->next) @@ -4333,8 +4276,7 @@ static int last_overlay_modification_hooks_used; to the end of last_overlay_modification_hooks. */ static void -add_overlay_mod_hooklist (functionlist, overlay) - Lisp_Object functionlist, overlay; +add_overlay_mod_hooklist (Lisp_Object functionlist, Lisp_Object overlay) { int oldsize = XVECTOR (last_overlay_modification_hooks)->size; @@ -4362,10 +4304,8 @@ add_overlay_mod_hooklist (functionlist, overlay) and the length of deleted or replaced old text. */ void -report_overlay_modification (start, end, after, arg1, arg2, arg3) - Lisp_Object start, end; - int after; - Lisp_Object arg1, arg2, arg3; +report_overlay_modification (Lisp_Object start, Lisp_Object end, int after, + Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3) { Lisp_Object prop, overlay; struct Lisp_Overlay *tail; @@ -4490,10 +4430,8 @@ report_overlay_modification (start, end, after, arg1, arg2, arg3) } static void -call_overlay_mod_hooks (list, overlay, after, arg1, arg2, arg3) - Lisp_Object list, overlay; - int after; - Lisp_Object arg1, arg2, arg3; +call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, int after, + Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3) { struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; @@ -4513,8 +4451,7 @@ call_overlay_mod_hooks (list, overlay, after, arg1, arg2, arg3) /* Delete any zero-sized overlays at position POS, if the `evaporate' property is set. */ void -evaporate_overlays (pos) - EMACS_INT pos; +evaporate_overlays (EMACS_INT pos) { Lisp_Object overlay, hit_list; struct Lisp_Overlay *tail; @@ -4552,9 +4489,7 @@ evaporate_overlays (pos) in the slot with offset OFFSET. */ void -buffer_slot_type_mismatch (newval, type) - Lisp_Object newval; - int type; +buffer_slot_type_mismatch (Lisp_Object newval, int type) { Lisp_Object predicate; @@ -5041,9 +4976,7 @@ extern void r_alloc_free (POINTER_TYPE **ptr); /* Allocate NBYTES bytes for buffer B's text buffer. */ static void -alloc_buffer_text (b, nbytes) - struct buffer *b; - size_t nbytes; +alloc_buffer_text (struct buffer *b, size_t nbytes) { POINTER_TYPE *p; @@ -5098,8 +5031,7 @@ enlarge_buffer_text (struct buffer *b, EMACS_INT delta) /* Free buffer B's text buffer. */ static void -free_buffer_text (b) - struct buffer *b; +free_buffer_text (struct buffer *b) { BLOCK_INPUT; @@ -5122,7 +5054,7 @@ free_buffer_text (b) ***********************************************************************/ void -init_buffer_once () +init_buffer_once (void) { int idx; @@ -5318,7 +5250,7 @@ init_buffer_once () } void -init_buffer () +init_buffer (void) { char *pwd; Lisp_Object temp; @@ -5402,12 +5334,8 @@ init_buffer () } while (0) static void -defvar_per_buffer (bo_fwd, namestring, address, type, doc) - struct Lisp_Buffer_Objfwd *bo_fwd; - char *namestring; - Lisp_Object *address; - Lisp_Object type; - char *doc; +defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, char *namestring, + Lisp_Object *address, Lisp_Object type, char *doc) { struct Lisp_Symbol *sym; int offset; @@ -5435,7 +5363,7 @@ defvar_per_buffer (bo_fwd, namestring, address, type, doc) /* initialize the buffer routines */ void -syms_of_buffer () +syms_of_buffer (void) { staticpro (&last_overlay_modification_hooks); last_overlay_modification_hooks @@ -6338,7 +6266,7 @@ The function `kill-all-local-variables' runs this before doing anything else. * } void -keys_of_buffer () +keys_of_buffer (void) { initial_define_key (control_x_map, 'b', "switch-to-buffer"); initial_define_key (control_x_map, 'k', "kill-buffer"); -- cgit v1.2.1 From 72af86bd8cf1812d1fcc8924c4093d692040a664 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 8 Jul 2010 00:18:28 +0200 Subject: Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp * alloc.c (overrun_check_malloc, overrun_check_realloc) (overrun_check_free, xstrdup, allocate_string) (allocate_string_data, compact_small_strings, Fmake_string) (make_unibyte_string, make_multibyte_string) (make_string_from_bytes, make_specified_string, make_float) (Fcons, allocate_terminal, allocate_frame, make_pure_string) (Fgarbage_collect): Replace bcopy, safe_bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp. * atimer.c (start_atimer, set_alarm): Likewise. * buffer.c (clone_per_buffer_values, report_overlay_modification) (mmap_realloc, init_buffer_once): Likewise. * callint.c (Fcall_interactively): Likewise. * callproc.c (Fcall_process, Fcall_process_region, child_setup) (getenv_internal_1): Likewise. * casefiddle.c (casify_object): Likewise. * ccl.c (ccl_driver): Likewise. * character.c (str_as_multibyte, str_to_multibyte): Likewise. * charset.c (load_charset_map_from_file) (load_charset_map_from_file, load_charset_map_from_vector) (Fdefine_charset_internal): Likewise. * cm.c (Wcm_clear): Likewise. * coding.c (decode_eol, decode_coding_object) (Fset_coding_system_priority, make_subsidiaries): Likewise. * data.c (Faset): Likewise. * dired.c (directory_files_internal, file_name_completion_stat): Likewise. * dispnew.c (new_glyph_matrix, adjust_glyph_matrix) (clear_glyph_row, copy_row_except_pointers) (copy_glyph_row_contents, new_glyph_pool, realloc_glyph_pool) (save_current_matrix, restore_current_matrix) (build_frame_matrix_from_leaf_window, mirrored_line_dance) (mirror_line_dance, scrolling_window): Likewise. * doc.c (Fsnarf_documentation, Fsubstitute_command_keys): Likewise. * doprnt.c (doprnt): Likewise. * editfns.c (Fuser_full_name, make_buffer_string_both) (Fmessage_box, Fformat, Ftranspose_regions): Likewise. * emacs.c (sort_args): Likewise. * eval.c (Fapply, Ffuncall): Likewise. * fileio.c (Ffile_name_directory, make_temp_name) (Fexpand_file_name, search_embedded_absfilename) (Fsubstitute_in_file_name, Ffile_symlink_p, Finsert_file_contents) (auto_save_error): Likewise. * fns.c (Fstring_equal, Fcopy_sequence, concat) (string_to_multibyte, Fstring_as_unibyte, Fstring_as_multibyte) (internal_equal, Fclear_string, larger_vector, copy_hash_table) (Fmake_hash_table): Likewise. * fringe.c (Fdefine_fringe_bitmap): Likewise. * ftfont.c (ftfont_text_extents): Likewise. * getloadavg.c (getloadavg): Likewise. * image.c (define_image_type, make_image, make_image_cache) (x_create_x_image_and_pixmap, xbm_image_p) (w32_create_pixmap_from_bitmap_data, xbm_load, xpm_lookup_color) (xpm_image_p, x_create_bitmap_from_xpm_data, xpm_load) (init_color_table, x_build_heuristic_mask, pbm_image_p, pbm_load) (png_image_p, png_read_from_memory, png_load, jpeg_image_p) (tiff_image_p, tiff_read_from_memory, gif_image_p) (gif_read_from_memory, gif_load, svg_image_p, gs_image_p): Likewise. * indent.c (scan_for_column, compute_motion): Likewise. * insdel.c (gap_left, gap_right, make_gap_smaller, copy_text) (insert_1_both, insert_from_gap, replace_range_2): Likewise. * intervals.c (reproduce_tree, reproduce_tree_obj): Likewise. * keyboard.c (echo_char, save_getcjmp, restore_getcjmp) (kbd_buffer_store_event_hold, apply_modifiers_uncached) (store_user_signal_events, menu_bar_items, tool_bar_items) (process_tool_bar_item, append_tool_bar_item) (read_char_minibuf_menu_prompt, read_key_sequence) (Fread_key_sequence, Fread_key_sequence_vector, Frecent_keys): Likewise. * keymap.c (current_minor_maps, Fdescribe_buffer_bindings): Likewise. * lisp.h (STRING_COPYIN): Likewise. * lread.c (Fload, read1, oblookup): Likewise. * msdos.c (Frecent_doskeys): Likewise. * nsfns.m (Fx_create_frame): Likewise. * nsfont.m (nsfont_open, nsfont_text_extents, ns_glyph_metrics): Likewise. * nsimage.m (EmacsImage-initFromSkipXBM:width:height:) (EmacsImage-initForXPMWithDepth:width:height:flip:length:): Likewise. * nsmenu.m (ns_update_menubar): Likewise. * nsterm.m (ns_draw_fringe_bitmap, ns_term_init): Likewise. * print.c (print_unwind, printchar, strout, print_string) (print_error_message): Likewise. * process.c (conv_lisp_to_sockaddr, set_socket_option) (Fmake_network_process, Fnetwork_interface_list) (Fnetwork_interface_info, read_process_output, Fprocess_send_eof) (init_process): Likewise. * ralloc.c (resize_bloc, r_alloc_sbrk, r_alloc_init): Likewise. * regex.c (init_syntax_once, regex_compile, re_compile_fastmap): Likewise. * scroll.c (do_scrolling, do_direct_scrolling) (scrolling_max_lines_saved): Likewise. * search.c (search_buffer, wordify, Freplace_match): Likewise. * sound.c (wav_init, au_init, Fplay_sound_internal): Likewise. * syntax.c (skip_chars, skip_syntaxes): Likewise. * sysdep.c (child_setup_tty, sys_subshell, emacs_get_tty) (emacs_set_tty): Likewise. * term.c (encode_terminal_code, calculate_costs) (produce_special_glyphs, create_tty_output, init_tty, delete_tty): Likewise. * termcap.c (tgetst1, gobble_line): Likewise. * termhooks.h (EVENT_INIT): Likewise. * tparam.c (tparam1): Likewise. * unexalpha.c (unexec): Likewise. * unexec.c (write_segment): Likewise. * unexmacosx.c (unexec_write_zero): Likewise. * w32fns.c (w32_wnd_proc, Fx_create_frame, x_create_tip_frame) (Fx_file_dialog, Fsystem_move_file_to_trash): Likewise. * w32font.c (w32font_list_family, w32font_text_extents) (w32font_list_internal, w32font_match_internal) (w32font_open_internal, compute_metrics, Fx_select_font): Likewise. * w32menu.c (set_frame_menubar, add_menu_item) (w32_menu_display_help, w32_free_submenu_strings): Likewise. * w32term.c (XCreateGC, w32_initialize_display_info): Likewise. * w32uniscribe.c (uniscribe_list_family): Likewise. * w32xfns.c (get_next_msg, post_msg, prepend_msg): Likewise. * window.c (make_window, replace_window, set_window_buffer) (Fsplit_window): Likewise. * xdisp.c (init_iterator, RECORD_OVERLAY_STRING, reseat_to_string) (add_to_log, message3, x_consider_frame_title) (append_space_for_newline, extend_face_to_end_of_line) (decode_mode_spec_coding, init_glyph_string): Likewise. * xfaces.c (x_create_gc, get_lface_attributes_no_remap) (Finternal_copy_lisp_face, Finternal_merge_in_global_face) (face_attr_equal_p, make_realized_face, make_face_cache) (free_realized_faces, lookup_named_face, smaller_face) (face_with_height, lookup_derived_face) (x_supports_face_attributes_p, Finternal_set_font_selection_order) (Finternal_set_font_selection_order, realize_default_face) (compute_char_face, face_at_buffer_position) (face_for_overlay_string, face_at_string_position, merge_faces): Likewise. * xfns.c (xic_create_fontsetname, Fx_create_frame) (Fx_window_property, x_create_tip_frame) (Fx_backspace_delete_keys_p): Likewise. * xfont.c (xfont_list, xfont_match, xfont_list_family) (xfont_text_extents): Likewise. * xmenu.c (set_frame_menubar, xmenu_show): Likewise. * xrdb.c (magic_file_p, x_get_resource): Likewise. * xselect.c (x_queue_event, x_get_window_property) (receive_incremental_selection): Likewise. * xsmfns.c (x_session_check_input): Likewise. * xterm.c (x_send_scroll_bar_event, SET_SAVED_MENU_EVENT) (handle_one_xevent, x_check_errors, xim_initialize, x_term_init): Likewise. * character.h (BCOPY_SHORT): Removed. * config.in: Regenerate. * dispnew.c (safe_bcopy): Only define as dummy if PROFILING. * emacs.c (main) [PROFILING]: Don't declare dump_opcode_frequencies. * lisp.h (safe_bcopy): Remove declaration. (memset) [!HAVE_MEMSET]: Declare. (memcpy) [!HAVE_MEMCPY]: Likewise. (memmove) [!HAVE_MEMMOVE]: Likewise. (memcmp) [!HAVE_MEMCMP]: Likewise. * s/ms-w32.h (bzero, bcopy, bcmp, GAP_USE_BCOPY) (BCOPY_UPWARD_SAFE, BCOPY_DOWNWARD_SAFE, HAVE_BCOPY, HAVE_BCMP): Don't define. (HAVE_MEMCMP, HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET): Define. * s/msdos.h (GAP_USE_BCOPY, BCOPY_UPWARD_SAFE) (BCOPY_DOWNWARD_SAFE): Don't define. * sysdep.c (memset) [!HAVE_MEMSET]: Define. (memcpy) [!HAVE_MEMCPY]: Define. (memmove) [!HAVE_MEMMOVE]: Define. (memcmp) [!HAVE_MEMCMP]: Define. * config.nt (HAVE_BCOPY, HAVE_BCMP): Remove undefs. (HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_MEMCMP): Add undefs. * sed2v2.inp (HAVE_MEMCPY, HAVE_MEMSET): Edit to 1. (HAVE_BZERO): Don't edit. * lwlib.c (lwlib_memset, lwlib_bcopy): Remove. (malloc_widget_value, free_widget_info, allocate_widget_instance) (lw_separator_p): Replace lwlib_memset, lwlib_bcopy, bzero, bcmp by memset, memcpy, memcmp. * lwlib-utils.c (XtApplyToWidgets): Likewise. * xlwmenu.c (XlwMenuInitialize): Likewise. * lwlib.h (lwlib_bcopy): Remove declaration. * ebrowse.c (add_sym, make_namespace): Replace bcopy, bzero by memcpy, memmove, memset. * pop.c (pop_retrieve, socket_connection, pop_getline): Likewise. * CPP-DEFINES (BCOPY_DOWNWARD_SAFE, BCOPY_UPWARD_SAFE) (GAP_USE_BCOPY, HAVE_BCMP, HAVE_BCOPY, bcmp, bcopy, bzero): Remove. * configure.in: Don't check for bcopy, bcmp, bzero. Don't include and don't define bcopy, bzero, BCMP in config.h. --- src/buffer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 57e4986a0bb..b8f19e96c43 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -514,7 +514,7 @@ clone_per_buffer_values (struct buffer *from, struct buffer *to) PER_BUFFER_VALUE (to, offset) = obj; } - bcopy (from->local_flags, to->local_flags, sizeof to->local_flags); + memcpy (to->local_flags, from->local_flags, sizeof to->local_flags); to->overlays_before = copy_overlays (to, from->overlays_before); to->overlays_after = copy_overlays (to, from->overlays_after); @@ -4413,8 +4413,8 @@ report_overlay_modification (Lisp_Object start, Lisp_Object end, int after, Lisp_Object *copy = (Lisp_Object *) alloca (size * sizeof (Lisp_Object)); int i; - bcopy (XVECTOR (last_overlay_modification_hooks)->contents, - copy, size * sizeof (Lisp_Object)); + memcpy (copy, XVECTOR (last_overlay_modification_hooks)->contents, + size * sizeof (Lisp_Object)); gcpro1.var = copy; gcpro1.nvars = size; @@ -4877,7 +4877,7 @@ mmap_realloc (var, nbytes) } else if (mmap_alloc (var, nbytes)) { - bcopy (old_ptr, *var, r->nbytes_specified); + memcpy (*var, old_ptr, r->nbytes_specified); mmap_free_1 (MMAP_REGION (old_ptr)); result = *var; r = MMAP_REGION (result); @@ -5058,7 +5058,7 @@ init_buffer_once (void) { int idx; - bzero (buffer_permanent_local_flags, sizeof buffer_permanent_local_flags); + memset (buffer_permanent_local_flags, 0, sizeof buffer_permanent_local_flags); /* Make sure all markable slots in buffer_defaults are initialized reasonably, so mark_buffer won't choke. */ @@ -5146,7 +5146,7 @@ init_buffer_once (void) if (sizeof (EMACS_INT) != sizeof (Lisp_Object)) abort (); /* 0 means not a lisp var, -1 means always local, else mask */ - bzero (&buffer_local_flags, sizeof buffer_local_flags); + memset (&buffer_local_flags, 0, sizeof buffer_local_flags); XSETINT (buffer_local_flags.filename, -1); XSETINT (buffer_local_flags.directory, -1); XSETINT (buffer_local_flags.backed_up, -1); -- cgit v1.2.1 From 5842a27bbfb7efa6872824e501bc7ec98b631553 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 8 Jul 2010 14:25:08 -0700 Subject: 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. --- src/buffer.c | 138 ++++++++++++++++++++--------------------------------------- 1 file changed, 47 insertions(+), 91 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index b8f19e96c43..46e1b90ac34 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -190,8 +190,7 @@ nsberror (Lisp_Object spec) DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, doc: /* Return non-nil if OBJECT is a buffer which has not been killed. Value is nil if OBJECT is not a buffer or if it has been killed. */) - (object) - Lisp_Object object; + (Lisp_Object object) { return ((BUFFERP (object) && ! NILP (XBUFFER (object)->name)) ? Qt : Qnil); @@ -202,8 +201,7 @@ DEFUN ("buffer-list", Fbuffer_list, Sbuffer_list, 0, 1, 0, If the optional arg FRAME is a frame, we return the buffer list in the proper order for that frame: the buffers in FRAME's `buffer-list' frame parameter come first, followed by the rest of the buffers. */) - (frame) - Lisp_Object frame; + (Lisp_Object frame) { Lisp_Object general; general = Fmapcar (Qcdr, Vbuffer_alist); @@ -266,8 +264,7 @@ DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, BUFFER-OR-NAME must be either a string or a buffer. If BUFFER-OR-NAME is a string and there is no buffer with that name, return nil. If BUFFER-OR-NAME is a buffer, return it as given. */) - (buffer_or_name) - register Lisp_Object buffer_or_name; + (register Lisp_Object buffer_or_name) { if (BUFFERP (buffer_or_name)) return buffer_or_name; @@ -281,8 +278,7 @@ DEFUN ("get-file-buffer", Fget_file_buffer, Sget_file_buffer, 1, 1, 0, The buffer's `buffer-file-name' must match exactly the expansion of FILENAME. If there is no such live buffer, return nil. See also `find-buffer-visiting'. */) - (filename) - register Lisp_Object filename; + (register Lisp_Object filename) { register Lisp_Object tail, buf, tem; Lisp_Object handler; @@ -337,8 +333,7 @@ buffer does not keep undo information. If BUFFER-OR-NAME is a buffer instead of a string, return it as given, even if it is dead. The return value is never nil. */) - (buffer_or_name) - register Lisp_Object buffer_or_name; + (register Lisp_Object buffer_or_name) { register Lisp_Object buffer, name; register struct buffer *b; @@ -533,8 +528,7 @@ NAME should be a string which is not the name of an existing buffer. Optional argument CLONE non-nil means preserve BASE-BUFFER's state, such as major and minor modes, in the indirect buffer. CLONE nil means the indirect buffer's state is reset to default values. */) - (base_buffer, name, clone) - Lisp_Object base_buffer, name, clone; + (Lisp_Object base_buffer, Lisp_Object name, Lisp_Object clone) { Lisp_Object buf, tem; struct buffer *b; @@ -829,8 +823,7 @@ Otherwise modify name by appending `', incrementing NUMBER \(starting at 2) until an unused name is found, and then return that name. Optional second argument IGNORE specifies a name that is okay to use (if it is in the sequence to be tried) even if a buffer with that name exists. */) - (name, ignore) - register Lisp_Object name, ignore; + (register Lisp_Object name, Lisp_Object ignore) { register Lisp_Object gentemp, tem; int count; @@ -864,8 +857,7 @@ DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, doc: /* Return the name of BUFFER, as a string. BUFFER defaults to the current buffer. Return nil if BUFFER has been killed. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { if (NILP (buffer)) return current_buffer->name; @@ -876,8 +868,7 @@ Return nil if BUFFER has been killed. */) DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, doc: /* Return name of file BUFFER is visiting, or nil if none. No argument or nil as argument means use the current buffer. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { if (NILP (buffer)) return current_buffer->filename; @@ -890,8 +881,7 @@ DEFUN ("buffer-base-buffer", Fbuffer_base_buffer, Sbuffer_base_buffer, doc: /* Return the base buffer of indirect buffer BUFFER. If BUFFER is not indirect, return nil. BUFFER defaults to the current buffer. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { struct buffer *base; Lisp_Object base_buffer; @@ -915,9 +905,7 @@ DEFUN ("buffer-local-value", Fbuffer_local_value, doc: /* Return the value of VARIABLE in BUFFER. If VARIABLE does not have a buffer-local binding in BUFFER, the value is the default binding of the variable. */) - (variable, buffer) - register Lisp_Object variable; - register Lisp_Object buffer; + (register Lisp_Object variable, register Lisp_Object buffer) { register struct buffer *buf; register Lisp_Object result; @@ -1015,8 +1003,7 @@ Most elements look like (SYMBOL . VALUE), describing one variable. For a symbol that is locally unbound, just the symbol appears in the value. Note that storing new VALUEs in these elements doesn't change the variables. No argument or nil as argument means use current buffer as BUFFER. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { register struct buffer *buf; register Lisp_Object result; @@ -1058,8 +1045,7 @@ DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, 0, 1, 0, doc: /* Return t if BUFFER was modified since its file was last read or saved. No argument or nil as argument means use current buffer as BUFFER. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { register struct buffer *buf; if (NILP (buffer)) @@ -1077,8 +1063,7 @@ DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, 1, 1, 0, doc: /* Mark current buffer as modified or unmodified according to FLAG. A non-nil FLAG means mark the buffer modified. */) - (flag) - register Lisp_Object flag; + (register Lisp_Object flag) { register int already; register Lisp_Object fn; @@ -1147,8 +1132,7 @@ DEFUN ("restore-buffer-modified-p", Frestore_buffer_modified_p, doc: /* Like `set-buffer-modified-p', with a difference concerning redisplay. It is not ensured that mode lines will be updated to show the modified state of the current buffer. Use with care. */) - (flag) - Lisp_Object flag; + (Lisp_Object flag) { #ifdef CLASH_DETECTION Lisp_Object fn; @@ -1178,8 +1162,7 @@ DEFUN ("buffer-modified-tick", Fbuffer_modified_tick, Sbuffer_modified_tick, Each buffer has a tick counter which is incremented each time the text in that buffer is changed. It wraps around occasionally. No argument or nil as argument means use current buffer as BUFFER. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { register struct buffer *buf; if (NILP (buffer)) @@ -1203,8 +1186,7 @@ values returned by two individual calls of `buffer-chars-modified-tick', you can tell whether a character change occurred in that buffer in between these calls. No argument or nil as argument means use current buffer as BUFFER. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { register struct buffer *buf; if (NILP (buffer)) @@ -1230,8 +1212,7 @@ If UNIQUE is non-nil, come up with a new name using Interactively, you can set UNIQUE with a prefix argument. We return the name we actually gave the buffer. This does not change the name of the visited file (if any). */) - (newname, unique) - register Lisp_Object newname, unique; + (register Lisp_Object newname, Lisp_Object unique) { register Lisp_Object tem, buf; @@ -1278,8 +1259,7 @@ If the optional third argument FRAME is non-nil, use that frame's buffer list instead of the selected frame's buffer list. If no other buffer exists, the buffer `*scratch*' is returned. If BUFFER is omitted or nil, some interesting buffer is returned. */) - (buffer, visible_ok, frame) - register Lisp_Object buffer, visible_ok, frame; + (register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame) { Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer); register Lisp_Object tail, buf, notsogood, tem, pred, add_ons; @@ -1350,8 +1330,7 @@ DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, 0, 1, "", doc: /* Start keeping undo information for buffer BUFFER. No argument or nil as argument means do this for the current buffer. */) - (buffer) - register Lisp_Object buffer; + (register Lisp_Object buffer) { Lisp_Object real_buffer; @@ -1392,8 +1371,7 @@ is running. Any processes that have this buffer as the `process-buffer' are killed with SIGHUP. */) - (buffer_or_name) - Lisp_Object buffer_or_name; + (Lisp_Object buffer_or_name) { Lisp_Object buffer; register struct buffer *b; @@ -1682,8 +1660,7 @@ For the *scratch* buffer, use `initial-major-mode', otherwise choose a mode according to `default-major-mode'. Use this function before selecting the buffer, since it may need to inspect the current buffer's major mode. */) - (buffer) - Lisp_Object buffer; + (Lisp_Object buffer) { int count; Lisp_Object function; @@ -1770,8 +1747,7 @@ its buffer, use `pop-to-buffer' for displaying the buffer. WARNING: This is NOT the way to work on another buffer temporarily within a Lisp program! Use `set-buffer' instead. That avoids messing with the window-buffer correspondences. */) - (buffer_or_name, norecord) - Lisp_Object buffer_or_name, norecord; + (Lisp_Object buffer_or_name, Lisp_Object norecord) { if (EQ (buffer_or_name, Fwindow_buffer (selected_window))) { @@ -1800,7 +1776,7 @@ messing with the window-buffer correspondences. */) DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, doc: /* Return the current buffer as a Lisp object. */) - () + (void) { register Lisp_Object buf; XSETBUFFER (buf, current_buffer); @@ -1986,8 +1962,7 @@ also `save-excursion' when you want to make a buffer current temporarily. This function does not display the buffer, so its effect ends when the current command terminates. Use `switch-to-buffer' or `pop-to-buffer' to switch buffers permanently. */) - (buffer_or_name) - register Lisp_Object buffer_or_name; + (register Lisp_Object buffer_or_name) { register Lisp_Object buffer; buffer = Fget_buffer (buffer_or_name); @@ -2012,7 +1987,7 @@ set_buffer_if_live (Lisp_Object buffer) DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, Sbarf_if_buffer_read_only, 0, 0, 0, doc: /* Signal a `buffer-read-only' error if the current buffer is read-only. */) - () + (void) { if (!NILP (current_buffer->read_only) && NILP (Vinhibit_read_only)) @@ -2032,8 +2007,7 @@ from the selected window if it is displayed there. If the selected window is dedicated to its buffer, delete that window if there are other windows on the same frame. If the selected window is the only window on its frame, iconify that frame. */) - (buffer_or_name) - register Lisp_Object buffer_or_name; + (register Lisp_Object buffer_or_name) { Lisp_Object buffer; @@ -2087,7 +2061,7 @@ DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", doc: /* Delete the entire contents of the current buffer. Any narrowing restriction in effect (see `narrow-to-region') is removed, so the buffer is truly empty after this. */) - () + (void) { Fwiden (); @@ -2161,8 +2135,7 @@ extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *); DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, 1, 1, 0, doc: /* Swap the text between current buffer and BUFFER. */) - (buffer) - Lisp_Object buffer; + (Lisp_Object buffer) { struct buffer *other_buffer; CHECK_BUFFER (buffer); @@ -2300,8 +2273,7 @@ If FLAG is `to', this makes the buffer a multibyte buffer by changing all eight-bit bytes to eight-bit characters. If the multibyte flag was really changed, undo information of the current buffer is cleared. */) - (flag) - Lisp_Object flag; + (Lisp_Object flag) { struct Lisp_Marker *tail, *markers; struct buffer *other; @@ -2599,7 +2571,7 @@ a non-nil `permanent-local' property are not eliminated by this function. The first thing this function does is run the normal hook `change-major-mode-hook'. */) - () + (void) { if (!NILP (Vrun_hooks)) call1 (Vrun_hooks, Qchange_major_mode_hook); @@ -3700,8 +3672,7 @@ fix_overlays_before (struct buffer *bp, EMACS_INT prev, EMACS_INT pos) DEFUN ("overlayp", Foverlayp, Soverlayp, 1, 1, 0, doc: /* Return t if OBJECT is an overlay. */) - (object) - Lisp_Object object; + (Lisp_Object object) { return (OVERLAYP (object) ? Qt : Qnil); } @@ -3716,9 +3687,7 @@ for the front of the overlay advance when text is inserted there The fifth arg REAR-ADVANCE, if non-nil, makes the marker for the rear of the overlay advance when text is inserted there \(which means the text *is* included in the overlay). */) - (beg, end, buffer, front_advance, rear_advance) - Lisp_Object beg, end, buffer; - Lisp_Object front_advance, rear_advance; + (Lisp_Object beg, Lisp_Object end, Lisp_Object buffer, Lisp_Object front_advance, Lisp_Object rear_advance) { Lisp_Object overlay; struct buffer *b; @@ -3838,8 +3807,7 @@ DEFUN ("move-overlay", Fmove_overlay, Smove_overlay, 3, 4, 0, If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now. If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current buffer. */) - (overlay, beg, end, buffer) - Lisp_Object overlay, beg, end, buffer; + (Lisp_Object overlay, Lisp_Object beg, Lisp_Object end, Lisp_Object buffer) { struct buffer *b, *ob; Lisp_Object obuffer; @@ -3948,8 +3916,7 @@ buffer. */) DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, doc: /* Delete the overlay OVERLAY from its buffer. */) - (overlay) - Lisp_Object overlay; + (Lisp_Object overlay) { Lisp_Object buffer; struct buffer *b; @@ -3989,8 +3956,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, doc: /* Return the position at which OVERLAY starts. */) - (overlay) - Lisp_Object overlay; + (Lisp_Object overlay) { CHECK_OVERLAY (overlay); @@ -3999,8 +3965,7 @@ DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, doc: /* Return the position at which OVERLAY ends. */) - (overlay) - Lisp_Object overlay; + (Lisp_Object overlay) { CHECK_OVERLAY (overlay); @@ -4010,8 +3975,7 @@ DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, doc: /* Return the buffer OVERLAY belongs to. Return nil if OVERLAY has been deleted. */) - (overlay) - Lisp_Object overlay; + (Lisp_Object overlay) { CHECK_OVERLAY (overlay); @@ -4022,8 +3986,7 @@ DEFUN ("overlay-properties", Foverlay_properties, Soverlay_properties, 1, 1, 0, doc: /* Return a list of the properties on OVERLAY. This is a copy of OVERLAY's plist; modifying its conses has no effect on OVERLAY. */) - (overlay) - Lisp_Object overlay; + (Lisp_Object overlay) { CHECK_OVERLAY (overlay); @@ -4033,8 +3996,7 @@ OVERLAY. */) DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, doc: /* Return a list of the overlays that contain the character at POS. */) - (pos) - Lisp_Object pos; + (Lisp_Object pos) { int noverlays; Lisp_Object *overlay_vec; @@ -4066,8 +4028,7 @@ and also contained within the specified region. Empty overlays are included in the result if they are located at BEG, between BEG and END, or at END provided END denotes the position at the end of the buffer. */) - (beg, end) - Lisp_Object beg, end; + (Lisp_Object beg, Lisp_Object end) { int noverlays; Lisp_Object *overlay_vec; @@ -4097,8 +4058,7 @@ DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, doc: /* Return the next position after POS where an overlay starts or ends. If there are no overlay boundaries from POS to (point-max), the value is (point-max). */) - (pos) - Lisp_Object pos; + (Lisp_Object pos) { int noverlays; EMACS_INT endpos; @@ -4139,8 +4099,7 @@ DEFUN ("previous-overlay-change", Fprevious_overlay_change, doc: /* Return the previous position before POS where an overlay starts or ends. If there are no overlay boundaries from (point-min) to POS, the value is (point-min). */) - (pos) - Lisp_Object pos; + (Lisp_Object pos) { int noverlays; EMACS_INT prevpos; @@ -4176,7 +4135,7 @@ the cdr has all the overlays after the overlay center. Recentering overlays moves overlays between these lists. The lists you get are copies, so that changing them has no effect. However, the overlays you get are the real objects that the buffer uses. */) - () + (void) { struct Lisp_Overlay *ol; Lisp_Object before = Qnil, after = Qnil, tmp; @@ -4197,8 +4156,7 @@ DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, doc: /* Recenter the overlays of the current buffer around position POS. That makes overlay lookup faster for positions near POS (but perhaps slower for positions far away from POS). */) - (pos) - Lisp_Object pos; + (Lisp_Object pos) { CHECK_NUMBER_COERCE_MARKER (pos); @@ -4208,8 +4166,7 @@ for positions far away from POS). */) DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, doc: /* Get the property of overlay OVERLAY with property name PROP. */) - (overlay, prop) - Lisp_Object overlay, prop; + (Lisp_Object overlay, Lisp_Object prop) { CHECK_OVERLAY (overlay); return lookup_char_property (XOVERLAY (overlay)->plist, prop, 0); @@ -4217,8 +4174,7 @@ DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, doc: /* Set one property of overlay OVERLAY: give property PROP value VALUE. */) - (overlay, prop, value) - Lisp_Object overlay, prop, value; + (Lisp_Object overlay, Lisp_Object prop, Lisp_Object value) { Lisp_Object tail, buffer; int changed; -- cgit v1.2.1 From 49d937f4491b1813963810923c6796badc681031 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 12 Jul 2010 10:04:38 -0700 Subject: * src/buffer.c (Fset_buffer_multibyte): Remove subprocesses conditional. * src/process.c (close_process_descs): Use DOS_NT instead of WINDOWSNT. --- src/buffer.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 46e1b90ac34..ac39219e61e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2540,7 +2540,6 @@ current buffer is cleared. */) if (!modified_p && !NILP (Fbuffer_modified_p (Qnil))) Fset_buffer_modified_p (Qnil); -#ifdef subprocesses /* Update coding systems of this buffer's process (if any). */ { Lisp_Object process; @@ -2549,7 +2548,6 @@ current buffer is cleared. */) if (PROCESSP (process)) setup_process_coding_systems (process); } -#endif /* subprocesses */ return flag; } -- cgit v1.2.1 From 14fb57049117cfa49e26e7b8ac42951ce83cc03d Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 21 Jul 2010 12:45:01 +0200 Subject: * buffer.c (syms_of_buffer) : Doc fix. --- src/buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index a0acad309af..adb85b83e5f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -6032,14 +6032,14 @@ fringe indicator. INDICATOR specifies the logical indicator type which is one of the following symbols: `truncation' , `continuation', `overlay-arrow', -`top', `bottom', `up', `down', `one-line', `empty-line', or `unknown'. +`top', `bottom', `top-bottom', `up', `down', empty-line', or `unknown'. -BITMAPS is list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies +BITMAPS is a list of symbols (LEFT RIGHT [LEFT1 RIGHT1]) which specifies the actual bitmap shown in the left or right fringe for the logical indicator. LEFT and RIGHT are the bitmaps shown in the left and/or right fringe for the specific indicator. The LEFT1 or RIGHT1 bitmaps -are used only for the `bottom' and `one-line' indicators when the last -\(only) line in has no final newline. BITMAPS may also be a single +are used only for the `bottom' and `top-bottom' indicators when the +last (only) line has no final newline. BITMAPS may also be a single symbol which is used in both left and right fringes. */); DEFVAR_PER_BUFFER ("fringe-cursor-alist", -- cgit v1.2.1 From eec47d6ba48cb788d690b7ffea5b9a20613306e6 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 26 Jul 2010 20:52:35 -0700 Subject: Use const, move declarations to header files. * src/buffer.c (Fset_buffer_multibyte): Remove local extern declaration. * src/character.c (strwidth, parse_str_to_multibyte): Add const. * src/character.h (strwidth, parse_str_to_multibyte): Likewise. * src/charset.c (add_to_log): Remove declaration. * src/composite.c (syms_of_composite): Remove local extern declarations. * src/data.c (Finteractive_form): Use const. * src/dired.c (scmp): Add const. (directory_files_internal): Remove local extern declaration. * src/dispextern.h (add_to_log): Remove declaration. (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg) (x_frame_get_and_record_arg, x_default_parameter): Add const. * src/dispnew.c: Remove duplicate #include . (update_window, update_frame_1, init_display): Remove local extern declarations. * src/editfns.c (region_limit, syms_of_editfns): Remove local extern declarations. * src/emacs.c (main): Remove local extern declaration. * src/font.c (Qnormal, QCtype, QCfamily, QCweight, QCslant, QCwidth) (QCheight, QCsize, QCname): Remove declarations. * src/frame.c (x_get_resource_string, x_get_string_resource) (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg) (x_default_parameter): Use const. * src/image.c (QCwidth, QCheight, QCforeground, QCbackground, QCfile) (QCdata, QCtype, Qcenter): Remove declarations. * src/keyboard.h (do_mouse_tracking): Add declaration. * src/minibuf.c (Qmouse_face): Remove declaration. * src/msdos.c (IT_note_mouse_highlight): Remove local extern declaration. * src/xdisp.c (do_mouse_tracking): Remove declaration. (add_to_log): Use const. * src/xfaces.c (Qmouse_face): Remove declaration. (face_color_gray_p, tty_defined_color, defined_color) (face_color_gray_p, face_color_supported_p). Add const. * src/xfns.c: Include xlwmenu.h when USE_LUCID. (x_defined_color, xic_set_xfontset): Use const. (Fx_hide_tip): Remove local extern declaration. * src/xselect.c (selection_data_to_lisp_data) (x_property_data_to_lisp): * src/xrdb.c (x_get_string_resource, file_p) (x_get_customization_string, magic_file_p, search_magic_path) (get_system_app, get_user_app, x_load_resources, x_get_resource) (x_get_string_resource): Use const. * src/xterm.c (xlwmenu_window_p, xlwmenu_redisplay): Remove declarations. (x_text_icon, x_check_errors, x_connection_closed): Use const. * src/xterm.h (x_get_customization_string, x_load_resources) (x_get_resource, x_text_icon, x_text_icon, x_check_errors) (x_check_errors, x_property_data_to_lisp, defined_color) (xic_set_xfontset, x_defined_color): Use const. --- src/buffer.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index a90262fc557..fe0d200f503 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2512,7 +2512,6 @@ current buffer is cleared. */) if (!EQ (old_undo, Qt)) { /* Represent all the above changes by a special undo entry. */ - extern Lisp_Object Qapply; current_buffer->undo_list = Fcons (list3 (Qapply, intern ("set-buffer-multibyte"), NILP (flag) ? Qt : Qnil), -- cgit v1.2.1 From e6cba65065d7002d181c3d440bfc5e04ba953783 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 28 Jul 2010 22:48:06 -0700 Subject: Remove extern declarations from .c files, and them to .h files. * src/xsmfns.c (Vuser_login_name): * src/xrdb.c (Vdouble_click_time): * src/xfaces.c (xic_create_fontsetname): * src/w32select.c (waiting_for_input): * src/print.c (minibuffer_auto_raise): * src/msdos.c (Qhelp_echo): * src/macros.c (real_this_command): * src/keymap.c (Voverriding_local_map): * src/xterm.c (poll_for_input_1, gray_bitmap_width) (gray_bitmap_height, gray_bitmap_bits; * src/xmenu.c ( Voverriding_local_map) (Voverriding_local_map_menu_flag; Qmenu_item; use_dialog_box) (use_file_dialog, Xt_app_con): * src/xdisp.c (minibuffer_auto_raise, Voverriding_local_map) (Voverriding_local_map_menu_flag, Qmenu_item, Qface, Qinvisible) (Qwidth, Qinvisible, Qwindow, Qpriority, Qtool_bar_lines) (Qtool_bar_lines, ignore_mouse_drag_p): * src/minibuf.c (Voverriding_local_map, Qfield, Qfront_sticky) (Qrear_nonsticky, nconc2): * src/keyboard.c (current_global_map, minibuf_level, Qmenu_item) (Vhistory_length, Vtranslation_table_for_input, Qcomposition) (Qdisplay, Qafter_string, Qbefore_string, Qundefined): * src/fileio.c (use_dialog_box, use_file_dialog, Vuser_login_name) (minibuf_level, minibuffer_auto_raise, lisp_time_argument): * src/eval.c (Qinteractive_form, Qrisky_local_variable, Qfunction) (gc_in_progress): * src/doc.c (Voverriding_local_map, Qremap): * src/dired.c (completion_ignore_case, Qcompletion_ignore_case) (Vcompletion_regexp_list): * src/coding.c (Qmac, Qinsert_file_contents, Qwrite_region) (Qcompletion_ignore_case): * src/callint.c (Qcursor_in_echo_area, Qfile_directory_p, Qonly) (Vhistory_length, Vthis_original_command, real_this_command) (Qface, Qminibuffer_prompt, history_delete_duplicates): * src/image.c (Qrisky_local_variable): * src/fontset.c (QCname): * src/fns.c (minibuffer_auto_raise, QCname): * src/dispnew.c (char_ins_del_cost): * src/composite.c (font_fill_lglyph_metrics): * src/cmds.c (Qface, Vtranslation_table_for_input): * src/charset.c (map_char_table_for_charset, Qfile_name_handler_alist): * src/ccl.c (charset_unicode): * src/callproc.c (Vtemporary_file_directory): * src/buffer.c (emacs_strerror): Remove extern declarations. Remove extern declarations from .c files, and them to .h files. * src/keyboard.h (Qhelp_echo, waiting_for_input) (input_available_clear_time, ignore_mouse_drag_p) (Vdouble_click_time, real_this_command, Vthis_original_command): * src/keymap.h (Qremap, Qmenu_item, Voverriding_local_map) (Voverriding_local_map_menu_flag): * src/lisp.h (Qinteractive_form, use_file_dialog) (Qcursor_in_echo_area, QCascent, QCmargin, QCrelief, Qcount) (Qextension_data, QCconversion, QCcolor_symbols, QCheuristic_mask) (QCindex, QCmatrix, QCcolor_adjustment, QCmask) (Qrisky_local_variable, map_char_table_for_charset, Vprint_level) (Qfunction, debug_on_next_call, Qfield) (Vinhibit_field_text_motion, Vuser_login_name, lisp_time_argument) (Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string) (Qfile_directory_p, Qinsert_file_contents) (Qcompletion_ignore_case, Qcompletion_ignore_case) (Vcompletion_regexp_list, Vhistory_length, completion_ignore_case) (history_delete_duplicates, minibuffer_auto_raise, Qonly) (Qfile_name_handler_alist, Qfront_sticky, Qrear_nonsticky) (Qminibuffer_prompt) (Vtemporary_file_directory,char_ins_del_vector, Qface): * src/xterm.h (gray_bitmap_width, gray_bitmap_height) (gray_bitmap_bits, xic_create_fontsetname): * src/coding.h (Vtranslation_table_for_input): Add extern declarations. * src/data.c (Qwindow): Make non-static, used from other files too. * src/frame.c (validate_x_resource_name): Remove shadow definition for i. --- src/buffer.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index fe0d200f503..9dd396e6c08 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -174,8 +174,6 @@ static struct Lisp_Overlay * copy_overlays (struct buffer *, struct Lisp_Overlay static void modify_overlay (struct buffer *, EMACS_INT, EMACS_INT); static Lisp_Object buffer_lisp_local_variables (struct buffer *); -extern char * emacs_strerror (int); - /* For debugging; temporary. See set_buffer_internal. */ /* Lisp_Object Qlisp_mode, Vcheck_symbol; */ -- cgit v1.2.1 From 2c09a58f7e64af426e8484d510dc781e6da3e09d Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 29 Jul 2010 21:42:38 -0700 Subject: * src/buffer.c (Qwindow): Do not define, already defined in data.c. (syms_of_buffer): Do not intern and staticpro Qwindow. (Bug#6760) --- src/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 9dd396e6c08..6f41b36b92f 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -162,7 +162,7 @@ Lisp_Object Qget_file_buffer; Lisp_Object Qoverlayp; -Lisp_Object Qpriority, Qwindow, Qevaporate, Qbefore_string, Qafter_string; +Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string; Lisp_Object Qmodification_hooks; Lisp_Object Qinsert_in_front_hooks; @@ -5345,8 +5345,6 @@ syms_of_buffer (void) staticpro (&Qget_file_buffer); Qpriority = intern_c_string ("priority"); staticpro (&Qpriority); - Qwindow = intern_c_string ("window"); - staticpro (&Qwindow); Qbefore_string = intern_c_string ("before-string"); staticpro (&Qbefore_string); Qafter_string = intern_c_string ("after-string"); -- cgit v1.2.1 From 0e9c8657ca938bd3cdb90824873dff539801fdbe Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 7 Aug 2010 03:10:12 +0200 Subject: Remove duplicate declarations. * lib-src/ebrowse.c (usage, version, mark_virtual) * src/alloc.c (lisp_malloc) * src/buffer.c (set_buffer_internal, set_buffer_internal_1) * src/charset.h (emacs_mule_charset) * src/dispextern.h (inhibit_free_realized_faces, redraw_frame) (redraw_garbaged_frames, scroll_cost, update_frame, scrolling) (bitch_at_user) * src/lisp.h (Fcheck_coding_system, Fget_text_property) (Qfunction, Qcompletion_ignore_case, QCwidth, QCsize) --- src/buffer.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 6f41b36b92f..7d42489dd30 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -106,8 +106,6 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; int last_per_buffer_idx; EXFUN (Fset_buffer, 1); -void set_buffer_internal (struct buffer *b); -void set_buffer_internal_1 (struct buffer *b); static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, int after, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3); -- cgit v1.2.1 From 8ea90aa3525a93194e98b7e1b2ea77e96ca3dde6 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 9 Aug 2010 02:35:21 -0700 Subject: Use const char* instead of char*. Reduce the number of warnings with -Wwrite-strings. * src/xrdb.c (get_environ_db, get_system_name): * src/unexelf.c (find_section): * src/term.c (string_cost, string_cost_one_line, per_line_cost) (get_named_tty, init_tty): * src/sysdep.c (sys_subshell): * src/sound.c (sound_perror, sound_warning, vox_open, vox_init) (alsa_sound_perror, alsa_open, alsa_configure, alsa_init): * src/search.c (Freplace_match): * src/process.c (Fmake_network_process, send_process, init_process): * src/lread.c (Fload, init_lread): * src/keymap.c (Fdescribe_buffer_bindings, describe_map_tree): * src/keyboard.c (parse_tool_bar_item, struct event_head): * src/gtkutil.h (xg_get_font_name): * src/gtkutil.c (get_dialog_title, create_dialog, xg_get_font_name) (make_widget_for_menu_item, make_menu_item, create_menus) (xg_make_tool_item): * src/font.c (parse_matrix, font_parse_name): * src/floatfns.c (rounding_driver, float_error_fn_name): * src/filelock.c (get_boot_time_1, lock_file_1): * src/fileio.c (barf_or_query_if_file_exists, check_writable): * src/editfns.c (get_system_name, get_operating_system_release) (Fencode_time, Fset_time_zone_rule): * src/dispextern.h (string_cost, per_line_cost, get_named_tty, init_tty): * src/buffer.c (defvar_per_buffer): Use const. --- src/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 7d42489dd30..39fabf581bb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5283,7 +5283,7 @@ init_buffer (void) } while (0) static void -defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, char *namestring, +defvar_per_buffer (struct Lisp_Buffer_Objfwd *bo_fwd, const char *namestring, Lisp_Object *address, Lisp_Object type, char *doc) { struct Lisp_Symbol *sym; -- cgit v1.2.1