From 16a97296c05ec9d5bb4ffeae9dce90fc63f578ed Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 18:41:15 -0700 Subject: Make Emacs functions such as Fatom 'static' by default. This makes it easier for human readers (and static analyzers) to see whether these functions can be called from other modules. DEFUN now defines a static function. To make the function external so that it can be used in other C modules, use the new macro DEFUE. * lisp.h (DEFINE_FUNC): New macro, with the old contents of DEFUN. (DEFUN): Rewrite in terms of DEFINE_FUNC. It now generates a static function definition. Use DEFUE if you want an extern one. (DEFUE, INFUN): New macros. (Funibyte_char_to_multibyte, Fsyntax_table_p, Finit_image_library): (Feval_region, Fbacktrace, Ffetch_bytecode, Fswitch_to_buffer): (Ffile_executable_p, Fmake_symbolic_link, Fcommand_execute): (Fget_process, Fdocumentation_property, Fbyte_code, Ffile_attributes): Remove decls, since these functions are now static. (Funintern, Fget_internal_run_time): New decls, since these functions were already external. * alloc.c, buffer.c, callint.c, callproc.c, casefiddle.c, casetab.c: * ccl.c, character.c, chartab.c, cmds.c, coding.c, data.c, dispnew.c: * doc.c, editfns.c, emacs.c, eval.c, fileio.c, filelock.c, floatfns.c: * fns.c, font.c, fontset.c, frame.c, image.c, indent.c: * keyboard.c, keymap.c, lread.c: * macros.c, marker.c, menu.c, minibuf.c, print.c, process.c, search.c: * syntax.c, term.c, terminal.c, textprop.c, undo.c: * window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xsettings.c: Mark functions with DEFUE instead of DEFUN, if they are used in other modules. * buffer.c (Fset_buffer_major_mode, Fdelete_overlay): New forward decls for now-static functions. * buffer.h (Fdelete_overlay): Remove decl. * callproc.c (Fgetenv_internal): Mark as internal. * composite.c (Fremove_list_of_text_properties): Remove decl. (Fcomposition_get_gstring): New forward static decl. * composite.h (Fcomposite_get_gstring): Remove decl. * dired.c (Ffile_attributes): New forward static decl. * doc.c (Fdocumntation_property): New forward static decl. * eval.c (Ffetch_bytecode): New forward static decl. (Funintern): Remove extern decl; now in .h file where it belongs. * fileio.c (Fmake_symbolic_link): New forward static decl. * image.c (Finit_image_library): New forward static decl. * insdel.c (Fcombine_after_change_execute): Make forward decl static. * intervals.h (Fprevious_property_change): (Fremove_list_of_text_properties): Remove decls. * keyboard.c (Fthis_command_keys): Remove decl. (Fcommand_execute): New forward static decl. * keymap.c (Flookup_key): New forward static decl. (Fcopy_keymap): Now static. * keymap.h (Flookup_key): Remove decl. * process.c (Fget_process): New forward static decl. (Fprocess_datagram_address): Mark as internal. * syntax.c (Fsyntax_table_p): New forward static decl. (skip_chars): Remove duplicate decl. * textprop.c (Fprevious_property_change): New forward static decl. * window.c (Fset_window_fringes, Fset_window_scroll_bars): Now internal. (Fset_window_margins, Fset_window_vscroll): New forward static decls. * window.h (Fset_window_vscroll, Fset_window_margins): Remove decls. --- src/buffer.c | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index a0054e32d0a..a88afbb36e6 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -100,6 +100,8 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; int last_per_buffer_idx; +INFUN (Fset_buffer_major_mode, 1); +INFUN (Fdelete_overlay, 1); static void call_overlay_mod_hooks (Lisp_Object list, Lisp_Object overlay, int after, Lisp_Object arg1, Lisp_Object arg2, Lisp_Object arg3); @@ -157,7 +159,7 @@ nsberror (Lisp_Object spec) error ("Invalid buffer argument"); } -DEFUN ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, +DEFUE ("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. */) (Lisp_Object object) @@ -229,7 +231,7 @@ assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list) return Qnil; } -DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, +DEFUE ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, doc: /* Return the buffer named BUFFER-OR-NAME. 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 @@ -294,7 +296,7 @@ get_truename_buffer (register Lisp_Object filename) /* Incremented for each buffer created, to assign the buffer number. */ int buffer_count; -DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, +DEFUE ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed. If BUFFER-OR-NAME is a string and a live buffer with that name exists, return that buffer. If no such buffer exists, create a new buffer with @@ -830,8 +832,8 @@ reset_buffer_local_variables (register struct buffer *b, int permanent_too) and set-visited-file-name ought to be able to use this to really rename the buffer properly. */ -DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, - 1, 2, 0, +DEFUE ("generate-new-buffer-name", Fgenerate_new_buffer_name, + Sgenerate_new_buffer_name, 1, 2, 0, doc: /* Return a string that is the name of no existing buffer based on NAME. If there is no live buffer named NAME, then return NAME. Otherwise modify name by appending `', incrementing NUMBER @@ -868,7 +870,7 @@ it is in the sequence to be tried) even if a buffer with that name exists. */) } -DEFUN ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, +DEFUE ("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. */) @@ -880,7 +882,7 @@ Return nil if BUFFER has been killed. */) return BVAR (XBUFFER (buffer), name); } -DEFUN ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, +DEFUE ("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. */) (register Lisp_Object buffer) @@ -915,7 +917,7 @@ BUFFER defaults to the current buffer. */) return base_buffer; } -DEFUN ("buffer-local-value", Fbuffer_local_value, +DEFUE ("buffer-local-value", Fbuffer_local_value, Sbuffer_local_value, 2, 2, 0, doc: /* Return the value of VARIABLE in BUFFER. If VARIABLE does not have a buffer-local binding in BUFFER, the value @@ -1056,7 +1058,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) return result; } -DEFUN ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, +DEFUE ("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. */) @@ -1074,7 +1076,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; } -DEFUN ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, +DEFUE ("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. */) @@ -1266,7 +1268,7 @@ This does not change the name of the visited file (if any). */) return BVAR (current_buffer, name); } -DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, +DEFUE ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, doc: /* Return most recently selected buffer other than BUFFER. Buffers not visible in windows are preferred to visible buffers, unless optional second argument VISIBLE-OK is non-nil. @@ -1276,7 +1278,6 @@ If no other buffer exists, the buffer `*scratch*' is returned. If BUFFER is omitted or nil, some interesting buffer is returned. */) (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; notsogood = Qnil; @@ -1341,7 +1342,7 @@ If BUFFER is omitted or nil, some interesting buffer is returned. */) return buf; } -DEFUN ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, +DEFUE ("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. */) @@ -1370,7 +1371,7 @@ Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ The buffer being killed will be current while the hook is running.\n\ See `kill-buffer'." */ -DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", +DEFUE ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", doc: /* Kill buffer BUFFER-OR-NAME. The argument may be a buffer or the name of an existing buffer. Argument nil or omitted means kill the current buffer. Return t if the @@ -1789,7 +1790,7 @@ messing with the window-buffer correspondences. */) return switch_to_buffer_1 (buffer_or_name, norecord); } -DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, +DEFUE ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, doc: /* Return the current buffer as a Lisp object. */) (void) { @@ -1899,7 +1900,7 @@ set_buffer_temp (struct buffer *b) fetch_buffer_markers (b); } -DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, +DEFUE ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, doc: /* Make buffer BUFFER-OR-NAME current for editing operations. BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See also `save-excursion' when you want to make a buffer current @@ -1928,7 +1929,7 @@ set_buffer_if_live (Lisp_Object buffer) return Qnil; } -DEFUN ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, +DEFUE ("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) @@ -2001,7 +2002,7 @@ its frame, iconify that frame. */) return Qnil; } -DEFUN ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", +DEFUE ("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. */) @@ -2212,7 +2213,7 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, return Qnil; } -DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, +DEFUE ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, 1, 1, 0, doc: /* Set the multibyte flag of the current buffer to FLAG. If FLAG is t, this makes the buffer a multibyte buffer. @@ -2501,8 +2502,8 @@ current buffer is cleared. */) return flag; } -DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, - 0, 0, 0, +DEFUE ("kill-all-local-variables", Fkill_all_local_variables, + Skill_all_local_variables, 0, 0, 0, doc: /* Switch to Fundamental mode by killing current buffer's local variables. Most local variable bindings are eliminated so that the default values become effective once more. Also, the syntax table is set from @@ -3900,7 +3901,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, /* Overlay dissection functions. */ -DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, +DEFUE ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, doc: /* Return the position at which OVERLAY starts. */) (Lisp_Object overlay) { @@ -3909,7 +3910,7 @@ DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, return (Fmarker_position (OVERLAY_START (overlay))); } -DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, +DEFUE ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, doc: /* Return the position at which OVERLAY ends. */) (Lisp_Object overlay) { @@ -3999,7 +4000,7 @@ end of the buffer. */) return result; } -DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, +DEFUE ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, 1, 1, 0, doc: /* Return the next position after POS where an overlay starts or ends. If there are no overlay boundaries from POS to (point-max), @@ -4040,7 +4041,7 @@ the value is (point-max). */) return make_number (endpos); } -DEFUN ("previous-overlay-change", Fprevious_overlay_change, +DEFUE ("previous-overlay-change", Fprevious_overlay_change, Sprevious_overlay_change, 1, 1, 0, doc: /* Return the previous position before POS where an overlay starts or ends. If there are no overlay boundaries from (point-min) to POS, @@ -4109,7 +4110,7 @@ for positions far away from POS). */) return Qnil; } -DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, +DEFUE ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, doc: /* Get the property of overlay OVERLAY with property name PROP. */) (Lisp_Object overlay, Lisp_Object prop) { -- cgit v1.2.1 From 955cbe7b1720f09b2991b7d981147d9cc79d52e3 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 20:39:45 -0700 Subject: Declare Lisp_Object Q* variables to be 'static' if not exproted. This makes it easier for human readers (and static analyzers) to see whether these variables are used from other modules. * alloc.c, buffer.c, bytecode.c, callint.c, casetab.c, category.c: * ccl.c, character.c, charset.c, cmds.c, coding.c, composite.c: * data.c, dbusbind.c, dired.c, editfns.c, eval.c, fileio.c, fns.c: * font.c, frame.c, fringe.c, ftfont.c, image.c, keyboard.c, keymap.c: * lread.c, macros.c, minibuf.c, print.c, process.c, search.c: * sound.c, syntax.c, textprop.c, window.c, xdisp.c, xfaces.c, xfns.c: * xmenu.c, xselect.c: Declare Q* vars static if they are not used in other modules. * ccl.h, character.h, charset.h, coding.h, composite.h, font.h: * frame.h, intervals.h, keyboard.h, lisp.h, process.h, syntax.h: Remove decls of unexported vars. * keyboard.h (EVENT_HEAD_UNMODIFIED): Remove now-unused macro. --- src/buffer.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index a88afbb36e6..82913ac20e7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -113,30 +113,31 @@ static void reset_buffer_local_variables (struct buffer *b, int permanent_too); to prevent lossage due to user rplac'ing this alist or its elements. */ Lisp_Object Vbuffer_alist; -Lisp_Object Qkill_buffer_query_functions; +static Lisp_Object Qkill_buffer_query_functions; /* Hook run before changing a major mode. */ -Lisp_Object Qchange_major_mode_hook; +static Lisp_Object Qchange_major_mode_hook; Lisp_Object Qfirst_change_hook; Lisp_Object Qbefore_change_functions; Lisp_Object Qafter_change_functions; -Lisp_Object Qucs_set_table_for_input; +static Lisp_Object Qucs_set_table_for_input; -Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; -Lisp_Object Qpermanent_local_hook; +static Lisp_Object Qfundamental_mode, Qmode_class, Qpermanent_local; +static Lisp_Object Qpermanent_local_hook; -Lisp_Object Qprotected_field; +static Lisp_Object Qprotected_field; -Lisp_Object QSFundamental; /* A string "Fundamental" */ +static Lisp_Object QSFundamental; /* A string "Fundamental" */ -Lisp_Object Qkill_buffer_hook; +static Lisp_Object Qkill_buffer_hook; -Lisp_Object Qget_file_buffer; +static Lisp_Object Qget_file_buffer; -Lisp_Object Qoverlayp; +static Lisp_Object Qoverlayp; -Lisp_Object Qpriority, Qevaporate, Qbefore_string, Qafter_string; +Lisp_Object Qpriority, Qbefore_string, Qafter_string; +static Lisp_Object Qevaporate; Lisp_Object Qmodification_hooks; Lisp_Object Qinsert_in_front_hooks; -- cgit v1.2.1 From c358e587580fbd9deb39b3ddde9383611529c2a6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 23:15:21 -0700 Subject: * buffer.c (buffer_count): Remove unused var. --- src/buffer.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 82913ac20e7..4e690f42934 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -294,9 +294,6 @@ get_truename_buffer (register Lisp_Object filename) return Qnil; } -/* Incremented for each buffer created, to assign the buffer number. */ -int buffer_count; - DEFUE ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed. If BUFFER-OR-NAME is a string and a live buffer with that name exists, -- cgit v1.2.1 From a7ca3326c4740ed3ed118b794d35d235de49f346 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Apr 2011 22:04:02 -0700 Subject: Undo the DEFUN->DEFUE change. --- src/buffer.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 4e690f42934..7b543b80a25 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -160,7 +160,7 @@ nsberror (Lisp_Object spec) error ("Invalid buffer argument"); } -DEFUE ("buffer-live-p", Fbuffer_live_p, Sbuffer_live_p, 1, 1, 0, +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. */) (Lisp_Object object) @@ -232,7 +232,7 @@ assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list) return Qnil; } -DEFUE ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, +DEFUN ("get-buffer", Fget_buffer, Sget_buffer, 1, 1, 0, doc: /* Return the buffer named BUFFER-OR-NAME. 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 @@ -294,7 +294,7 @@ get_truename_buffer (register Lisp_Object filename) return Qnil; } -DEFUE ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, +DEFUN ("get-buffer-create", Fget_buffer_create, Sget_buffer_create, 1, 1, 0, doc: /* Return the buffer specified by BUFFER-OR-NAME, creating a new one if needed. If BUFFER-OR-NAME is a string and a live buffer with that name exists, return that buffer. If no such buffer exists, create a new buffer with @@ -830,7 +830,7 @@ reset_buffer_local_variables (register struct buffer *b, int permanent_too) and set-visited-file-name ought to be able to use this to really rename the buffer properly. */ -DEFUE ("generate-new-buffer-name", Fgenerate_new_buffer_name, +DEFUN ("generate-new-buffer-name", Fgenerate_new_buffer_name, Sgenerate_new_buffer_name, 1, 2, 0, doc: /* Return a string that is the name of no existing buffer based on NAME. If there is no live buffer named NAME, then return NAME. @@ -868,7 +868,7 @@ it is in the sequence to be tried) even if a buffer with that name exists. */) } -DEFUE ("buffer-name", Fbuffer_name, Sbuffer_name, 0, 1, 0, +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. */) @@ -880,7 +880,7 @@ Return nil if BUFFER has been killed. */) return BVAR (XBUFFER (buffer), name); } -DEFUE ("buffer-file-name", Fbuffer_file_name, Sbuffer_file_name, 0, 1, 0, +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. */) (register Lisp_Object buffer) @@ -915,7 +915,7 @@ BUFFER defaults to the current buffer. */) return base_buffer; } -DEFUE ("buffer-local-value", Fbuffer_local_value, +DEFUN ("buffer-local-value", Fbuffer_local_value, Sbuffer_local_value, 2, 2, 0, doc: /* Return the value of VARIABLE in BUFFER. If VARIABLE does not have a buffer-local binding in BUFFER, the value @@ -1056,7 +1056,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) return result; } -DEFUE ("buffer-modified-p", Fbuffer_modified_p, Sbuffer_modified_p, +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. */) @@ -1074,7 +1074,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) return BUF_SAVE_MODIFF (buf) < BUF_MODIFF (buf) ? Qt : Qnil; } -DEFUE ("set-buffer-modified-p", Fset_buffer_modified_p, Sset_buffer_modified_p, +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. */) @@ -1266,7 +1266,7 @@ This does not change the name of the visited file (if any). */) return BVAR (current_buffer, name); } -DEFUE ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, +DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 3, 0, doc: /* Return most recently selected buffer other than BUFFER. Buffers not visible in windows are preferred to visible buffers, unless optional second argument VISIBLE-OK is non-nil. @@ -1340,7 +1340,7 @@ If BUFFER is omitted or nil, some interesting buffer is returned. */) return buf; } -DEFUE ("buffer-enable-undo", Fbuffer_enable_undo, Sbuffer_enable_undo, +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. */) @@ -1369,7 +1369,7 @@ Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\ The buffer being killed will be current while the hook is running.\n\ See `kill-buffer'." */ -DEFUE ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", +DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 0, 1, "bKill buffer: ", doc: /* Kill buffer BUFFER-OR-NAME. The argument may be a buffer or the name of an existing buffer. Argument nil or omitted means kill the current buffer. Return t if the @@ -1788,7 +1788,7 @@ messing with the window-buffer correspondences. */) return switch_to_buffer_1 (buffer_or_name, norecord); } -DEFUE ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, +DEFUN ("current-buffer", Fcurrent_buffer, Scurrent_buffer, 0, 0, 0, doc: /* Return the current buffer as a Lisp object. */) (void) { @@ -1898,7 +1898,7 @@ set_buffer_temp (struct buffer *b) fetch_buffer_markers (b); } -DEFUE ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, +DEFUN ("set-buffer", Fset_buffer, Sset_buffer, 1, 1, 0, doc: /* Make buffer BUFFER-OR-NAME current for editing operations. BUFFER-OR-NAME may be a buffer or the name of an existing buffer. See also `save-excursion' when you want to make a buffer current @@ -1927,7 +1927,7 @@ set_buffer_if_live (Lisp_Object buffer) return Qnil; } -DEFUE ("barf-if-buffer-read-only", Fbarf_if_buffer_read_only, +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) @@ -2000,7 +2000,7 @@ its frame, iconify that frame. */) return Qnil; } -DEFUE ("erase-buffer", Ferase_buffer, Serase_buffer, 0, 0, "*", +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. */) @@ -2211,7 +2211,7 @@ DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, return Qnil; } -DEFUE ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, +DEFUN ("set-buffer-multibyte", Fset_buffer_multibyte, Sset_buffer_multibyte, 1, 1, 0, doc: /* Set the multibyte flag of the current buffer to FLAG. If FLAG is t, this makes the buffer a multibyte buffer. @@ -2500,7 +2500,7 @@ current buffer is cleared. */) return flag; } -DEFUE ("kill-all-local-variables", Fkill_all_local_variables, +DEFUN ("kill-all-local-variables", Fkill_all_local_variables, Skill_all_local_variables, 0, 0, 0, doc: /* Switch to Fundamental mode by killing current buffer's local variables. Most local variable bindings are eliminated so that the default values @@ -3899,7 +3899,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, /* Overlay dissection functions. */ -DEFUE ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, +DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, doc: /* Return the position at which OVERLAY starts. */) (Lisp_Object overlay) { @@ -3908,7 +3908,7 @@ DEFUE ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, return (Fmarker_position (OVERLAY_START (overlay))); } -DEFUE ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, +DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, doc: /* Return the position at which OVERLAY ends. */) (Lisp_Object overlay) { @@ -3998,7 +3998,7 @@ end of the buffer. */) return result; } -DEFUE ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, +DEFUN ("next-overlay-change", Fnext_overlay_change, Snext_overlay_change, 1, 1, 0, doc: /* Return the next position after POS where an overlay starts or ends. If there are no overlay boundaries from POS to (point-max), @@ -4039,7 +4039,7 @@ the value is (point-max). */) return make_number (endpos); } -DEFUE ("previous-overlay-change", Fprevious_overlay_change, +DEFUN ("previous-overlay-change", Fprevious_overlay_change, Sprevious_overlay_change, 1, 1, 0, doc: /* Return the previous position before POS where an overlay starts or ends. If there are no overlay boundaries from (point-min) to POS, @@ -4108,7 +4108,7 @@ for positions far away from POS). */) return Qnil; } -DEFUE ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, +DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, doc: /* Get the property of overlay OVERLAY with property name PROP. */) (Lisp_Object overlay, Lisp_Object prop) { -- cgit v1.2.1 From cd64ea1d0df393beb93d1bdf19bd3990e3378f85 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 14 Apr 2011 12:34:42 -0700 Subject: * lisp.h (INFUN): Remove. Suggested by Dan Nicolaescu in . All uses spelled out. --- src/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/buffer.c') diff --git a/src/buffer.c b/src/buffer.c index 7b543b80a25..c649836adb8 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -100,8 +100,8 @@ static char buffer_permanent_local_flags[MAX_PER_BUFFER_VARS]; int last_per_buffer_idx; -INFUN (Fset_buffer_major_mode, 1); -INFUN (Fdelete_overlay, 1); +static Lisp_Object Fset_buffer_major_mode (Lisp_Object); +static Lisp_Object Fdelete_overlay (Lisp_Object); 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