diff options
author | Andreas Schwab <schwab@linux-m68k.org> | 2010-12-27 18:29:38 +0100 |
---|---|---|
committer | Andreas Schwab <schwab@linux-m68k.org> | 2010-12-27 18:29:38 +0100 |
commit | 2f7c71a117244e1967009e8a4a0c82cd7388b470 (patch) | |
tree | 476a0f8e86b99e7feb2f6dce1807c00de350a95b /src/eval.c | |
parent | c4b607ede11227b48de24b861f728d8fd20e6753 (diff) | |
download | emacs-2f7c71a117244e1967009e8a4a0c82cd7388b470.tar.gz |
Remove unused declarations
* src/buffer.c: Remove unused declarations.
* src/buffer.h: Likewise.
* src/charset.h: Likewise.
* src/composite.h: Likewise.
* src/dispextern.h: Likewise.
* src/dispnew.c: Likewise.
* src/font.h: Likewise.
* src/fontset.c: Likewise.
* src/fontset.h: Likewise.
* src/intervals.h: Likewise.
* src/keymap.h: Likewise.
* src/lisp.h: Likewise.
* src/syntax.c: Likewise.
* src/syntax.h: Likewise.
* src/termhooks.h: Likewise.
* src/window.h: Likewise.
* src/xsettings.h: Likewise.
* src/xterm.c: Likewise.
* src/xterm.h: Likewise.
* src/chartab.c (sub_char_table_ref): Make static.
* src/dispnew.c (line_hash_code, required_matrix_height)
(required_matrix_width): Likewise.
* src/eval.c (interactive_p, apply_lambda): Likewise.
* src/fns.c (string_make_multibyte, copy_hash_table, hash_clear):
Likewise.
* src/font.c (QCadstyle, QCregistry, font_make_spec)
(font_parse_fcname, font_encode_char, font_at): Likewise.
* src/frame.c (x_frame_get_arg): Likewise.
* src/keymap.c (get_keyelt): Likewise.
* src/lread.c (read_filtered_event): Likewise.
* src/print.c (write_string_1): Likewise.
* src/window.c (delete_window, window_height, window_width)
(foreach_window): Likewise.
* src/xrdb.c (x_get_customization_string, x_get_resource): Likewise.
* src/xterm.c (x_scroll_bar_clear, xembed_set_info)
(xembed_send_message): Likewise.
* src/eval.c (run_hook_list_with_args): Delete.
* src/font.c (font_unparse_gtkname, font_update_lface): Likewise.
* src/terminal.c (get_terminal_param): Likewise.
* src/xterm.c (x_alloc_lighter_color_for_widget): Likewise.
Diffstat (limited to 'src/eval.c')
-rw-r--r-- | src/eval.c | 53 |
1 files changed, 4 insertions, 49 deletions
diff --git a/src/eval.c b/src/eval.c index f8874ddd559..947e28a2e9c 100644 --- a/src/eval.c +++ b/src/eval.c @@ -167,6 +167,8 @@ Lisp_Object Vmacro_declaration_function; static Lisp_Object funcall_lambda (Lisp_Object, int, Lisp_Object*); static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; +static int interactive_p (int); +static Lisp_Object apply_lambda (Lisp_Object, Lisp_Object, int); void init_eval_once (void) @@ -581,7 +583,7 @@ way to do this), or via (not (or executing-kbd-macro noninteractive)). */) EXCLUDE_SUBRS_P non-zero means always return 0 if the function called is a built-in. */ -int +static int interactive_p (int exclude_subrs_p) { struct backtrace *btp; @@ -2685,53 +2687,6 @@ run_hook_with_args (int nargs, Lisp_Object *args, enum run_hooks_condition cond) } } -/* Run a hook symbol ARGS[0], but use FUNLIST instead of the actual - present value of that symbol. - Call each element of FUNLIST, - passing each of them the rest of ARGS. - The caller (or its caller, etc) must gcpro all of ARGS, - except that it isn't necessary to gcpro ARGS[0]. */ - -Lisp_Object -run_hook_list_with_args (Lisp_Object funlist, int nargs, Lisp_Object *args) -{ - Lisp_Object sym; - Lisp_Object val; - Lisp_Object globals; - struct gcpro gcpro1, gcpro2, gcpro3; - - sym = args[0]; - globals = Qnil; - GCPRO3 (sym, val, globals); - - for (val = funlist; CONSP (val); val = XCDR (val)) - { - if (EQ (XCAR (val), Qt)) - { - /* t indicates this hook has a local binding; - it means to run the global binding too. */ - - for (globals = Fdefault_value (sym); - CONSP (globals); - globals = XCDR (globals)) - { - args[0] = XCAR (globals); - /* In a global value, t should not occur. If it does, we - must ignore it to avoid an endless loop. */ - if (!EQ (args[0], Qt)) - Ffuncall (nargs, args); - } - } - else - { - args[0] = XCAR (val); - Ffuncall (nargs, args); - } - } - UNGCPRO; - return Qnil; -} - /* Run the hook HOOK, giving each function the two args ARG1 and ARG2. */ void @@ -3063,7 +3018,7 @@ usage: (funcall FUNCTION &rest ARGUMENTS) */) return val; } -Lisp_Object +static Lisp_Object apply_lambda (Lisp_Object fun, Lisp_Object args, int eval_flag) { Lisp_Object args_left; |