* lwlib.c (first_child) [USE_MOTIF]: Protoize.

* xfns.c (x_real_positions): Mark locals as initialized.

* xmenu.c (xmenu_show): Don't use uninitialized vars.

* xterm.c: Fix problems found by static analysis with other toolkits.

(toolkit_scroll_bar_interaction): Define and use only if USE_X_TOOLKIT.
(x_dispatch_event): Declare static only if !USE_GTK && USE_X_TOOLKIT.
Define if USE_GTK || (HAVE_MENUS && USE_X_TOOLKIT); USE_MOTIF need
not be part of this test.
(SET_SAVED_BUTTON_EVENT): Define only if USE_X_TOOLKIT || USE_GTK.
* xterm.h (x_dispatch_event): Use USE_GTK, not USE_MOTIF, when testing
whether to declare.
* xterm.c, xterm.h (x_mouse_leave): Bring this function back, but only if
defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK.

* xmenu.c (menu_help_callback): Pointer type fixes.

Use const pointers when pointing at readonly data.  Avoid pointer
signedness clashes.
(FALSE): Remove unused macro.
(update_frame_menubar): Remove unused decl.

* xfns.c (Fx_hide_tip): Move locals to avoid shadowing.

* menu.c (push_submenu_start, push_submenu_end): Do not define unless

USE_X_TOOLKIT || USE_GTK || HAVE_NS || defined HAVE_NTGUI.
(single_menu_item): Rename local to avoid shadowing.

* keyboard.c (make_lispy_event): Remove unused local var.

* frame.c, frame.h (x_get_resource_string): Bring this back, but

only if HAVE_X_WINDOWS && !USE_X_TOOLKIT.

Change bitmaps back to X11-compatible types.

Modernize to C89, for better static checking.

* Activate.c (XMenuActivate): Callback's first arg is readonly.
* AddPane.c (XMenuAddPane): Label is readonly.  Rename local
to avoid shadowing.
* AddSel.c (XMenuAddSelection): Help arg is readonly.  Rename local.
* Create.c (atoi, atof): Remove decls; include <stdlib.h>.
(MAX_INACT_PNUM, TILE_BUF_SIZE): Remove; unused.
(x_get_resource_string): Args are readonly.
(XAllocDisplayColor): colorName is readonly.
(XMenuCreate): def_env is readonly.  Remove unused locals.  Avoid
"else;".
* Destroy.c (XMenuDestroy): Return void.
* Error.c (XMenuError): Remove const pointer.
* EvHand.c (XMenuEventHandler): Return void.
* FindPane.c, FindSel.c: Include <string.h>.
* InsPane.c (XMenuInsertPane): Rename local to avoid shadowing.
* InsSel.c (XMenuInsertSelection): Likewise.
* Internal.c (toggle_color, BUFFER_SIZE): Remove; unused.
(_XMErrorList): Now const.
(_XMWinQueInit, _XMRecomputeGlobals, _XMTransToOrigin, _XMRefreshPane):
(_XMRefreshSelection): Return void.
(_XMWinQueFlush, _XMRefreshSelection): Rename locals to avoid
shadowing.
(_XMWinQueFlush): Use stack, not heap.  Don't use uninitialized var.
* SetAEQ.c (XMenuSetAEQ): Now returns void.
* SetFrz.c (XMenuSetFreeze): Likewise.
* X10.h (XAssoc): Use void * for generic pointer.
* XDelAssoc.c: Include XMenuInt.h rather than duplicating part of it.
* XDestAssoc.c, XMakeAssoc.c: Likewise.
* XDestAssoc.c (XDestroyAssocTable): Return void.
* XMakeAssoc.c (XMakeAssoc): Use void * for generic pointer.
* XMenu.h, XMenuInt.h: Adjust to signature changes.  Use const
for pointers to readonly storage.
* insque.c: Include XMenuInt.h, to check our own signature.
(emacs_insque, emacs_remque): Use void * for generic pointers.

* xgselect.c (xgselect_initialize): Check vs interface

even if ! (defined (USE_GTK) || defined (HAVE_GCONF)).

* xmenu.c (xmenu_show): Rename parm to avoid shadowing.

* xrdb.c (x_load_resources): Omit unused local.

* xterm.c (x_create_toolkit_scroll_bar): Use const * for pointers

to read-only memory.

* fns.c (vector): Remove; this old hack is no longer needed.

* xsmfns.c (gdk_x11_set_sm_client_id) [!USE_GTK]: Don't define.

* xsmfns.c: Remove unused var.

* xsmfns.c (create_client_leader_window): Rename shadowing arg.

* xrdb.c (x_load_resources) [!USE_MOTIF]: Omit unused local.

* xfns.c (USG): Use the kludged USG macro, to pacify gcc.

* xfns.c (x_window): Rename locals to avoid shadowing.

* xfns.c (free_frame_menubar, atof): Remove duplicate decls.

* xterm.c (x_term_init): Remove local to avoid shadowing.

* xterm.c (x_alloc_nearest_color_for_widget): Remove; unused.

* xfns.c, xterm.c (_XEditResCheckMessages): Protoize decl.

* xdisp.c, dispextern.h (set_vertical_scroll_bar): Now extern if

USE_TOOLKIT_SCROLL_BARS && !USE_GTK, as xterm.c needs it then.

* lwlib.c (EXPLAIN, destroy_one_instance): Avoid "else;".

* lwlib-utils.h, lwlib-utils.c (XtSafelyDestroyWidget): Remove; unused.

* xlwmenu.c (MINL): Define only if not emacs.

* xlwmenu.c (XlwMenuSetValues): Rename/ move locals to avoid shadowing.

Modified the code that parses the --cflags and --ldflags options to support parameters that include the = character as long as they are enclosed in quotes.

nus-registry.el (gnus-registry--split-fancy-with-parent-internal): Track by subject first, then sender.

Use completion-at-point for mailalias.el
* lisp/mail/mailalias.el: Use lexical-binding.
(pattern, mailalias-done): Declare dynamic.
(mail-completion-at-point-function): New function, from mail-complete.
(mail-complete): Use it.
(mail-completion-expand): New function.
(mail-get-names): Use it.
(mail-directory, mail-directory-process, mail-directory-stream):
Don't use `pattern' for lexically bound arg.
* lisp/mail/sendmail.el (mail-mode-map): Use completion-at-point.
(mail-mode): Setup mailalias completion here instead.

* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars.

* lisp/gnus/gnus-draft.el (gnus-draft-setup): New arg `dont-pop'.
(gnus-draft-send): Use it to avoid popping
up frames from gnus-group-send-queue.
* lisp/gnus/gnus.el (gnus-splash-svg-color-symbols): Don't use insert-file
from Lisp.
* lisp/gnus/message.el (message-bogus-system-names): Replace ^...$ => \`...\'.

* lisp/htmlfontify.el (hfy-etags-cmd): Remove inoperant eval-and-compile.
(hfy-e2x-etags-cmd, hfy-etags-cmd-alist-default)
(hfy-etags-cmd-alist): Don't eval-and-compile any more.

* lisp/emacs-lisp/bytecomp.el (byte-temp-output-buffer-show)
(byte-save-window-excursion, byte-temp-output-buffer-setup)
(byte-interactive-p): Define them again, for use when inlining old code.

* sysdep.c (emacs_read): Remove unnecessary check vs MAX_RW_COUNT.

emacs_write: Accept and return EMACS_INT for sizes.

* sound.c: Use EMACS_INT rather than size_t.

* process.c (send_process): Change a size_t to EMACS_INT.

* process.c (send_process): Change another size_t to EMACS_INT.

emacs_write: Accept and return EMACS_INT for sizes.

Merge from mainline.

lisp/loadup.el: Use `string-to-number', not `string-to-int'.

Fix link errors in the Mac OS build that were caused by variables being marked as static that should not have been.

* lisp/progmodes/gud.el (gud-gdb): Use completion-at-point instead of
gud-gdb-complete-command.
(gud-gdb-completions): New function, from gud-gdb-complete-command.
(gud-gdb-completion-at-point): New function.
(gud-gdb-completions): Remove.

src/font.c (Qopentype): Don't make static (used from w32uniscribe.c).

* src/process.c (Qprocessp): Don't declare static.
* src/lisp.h (Qprocessp): Declare again.

Fix merge typo.

Merge from mainline.

* lisp.h (INFUN): Remove.  Suggested by Dan Nicolaescu in
<http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00393.html>.
All uses spelled out.

* tramp.texi (Frequently Asked Questions): New item for disabling
Tramp in other packages.

* net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the
case when the scripts fail.  Use `tramp-do-file-attributes-with-ls'
then.
(tramp-do-copy-or-rename-file-out-of-band): Do not check any
longer, whether`executable-find' is bound.

* net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring.

Fix typos in the last change in gnus-registry docs.

gnus.texi (nnmairix caveats, Setup, Registry Article Refer Method)
 (Fancy splitting to parent, Store arbitrary data): Updated gnus-registry docs.
gnus-registry.el: Updated gnus-registry docs.

* fileio.c (Finsert_file_contents): Fix typo in 2005-05-13 change.  (Bug#8496)

Fix typo in previous comment.

Don't publish debugger-only interfaces to other modules.

* lisp.h (safe_debug_print, debug_output_compilation_hack):
(verify_bytepos, count_markers): Move decls to the only modules
that need them.
* region-cache.h (pp_cache): Likewise.
* window.h (check_all_windows): Likewise.
* marker.c, print.c, region-cache.c, window.c: Decls moved here.

* fileio.c: Add FIXMES mentioning Bug#8496.

* sysdep.c (croak): Now static, if

defined TIOCNOTTY || defined USG5 || defined CYGWIN.
* syssignal.h (croak): Declare only if not static.

2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>

* alloc.c (refill_memory_reserve): Now static if
!defined REL_ALLOC || defined SYSTEM_MALLOC.
* lisp.h (refill_memory_reserve): Declare only if not static.

Undo the DEFUN->DEFUE change.

* xsettings.c, xsettings.h (xsettings_get_system_normal_font):

Define only if USE_LUCID.

* xrdb.c (x_customization_string, x_rm_string): Now static.

* xmenu.c (x_menu_wait_for_event): Export only if USE_MOTIF.

* xterm.h (x_menu_wait_for_event): Declare only if USE_MOTIF.

* xdisp.c (draw_row_with_mouse_face): Now static.

* dispextern.h (draw_row_with_mouse_fave): Remove decl.

* window.h (check_all_windows): Mark externally visible.

* window.c (window_deletion_count): Now static.

* undo.c: Make symbols static if they're not exported.
(last_undo_buffer, last_boundary_position, pending_boundary):
Now static.

* textprop.c (interval_insert_behind_hooks): Now static.

(interval_insert_in_front_hooks): Likewise.

* term.c: Make symbols static if they're not exported.

(tty_turn_off_highlight, get_tty_terminal, max_frame_cols):
(max_frame_lines, tty_set_terminal_modes):
(tty_reset_terminal_modes, tty_turn_off_highlight):
(get_tty_terminal): Now static.
(term_mouse_moveto): Do not define if HAVE_WINDOW_SYSTEM.
* termhooks.h (term_mouse_moveto): Do not declare if
HAVE_WINDOW_SYSTEMM.
* dispextern.h (tty_set_terminal_modes, tty_reset_terminal_modes):
(tty_turn_off_highlight, get_tty_terminal): Remove decls.

* sysdep.c: Make symbols static if they're not exported.

(emacs_get_tty, emacs_set_tty, old_fcntl_flags, old_fcntl_owner):
Now static.
(sigprocmask_set, full_mask): Remove; unused.
(wait_debugging): Mark as visible.
* syssignal.h (SIGFULLMASK, full_mask): Remove decls.
* systty.h (emacs_get_tty, emacs_set_tty): Remove decls.

* syntax.c (syntax_temp): Define only if !__GNUC__.

* sound.c (current_sound_device, current_sound): Now static.

* search.c (searchbufs, searchbuf_head): Now static.

* scroll.c (scroll_cost): Remove; unused.

* dispextern.h (scroll_cost): Remove decl.

* region-cache.h (pp_cache): Mark as externally visible.

* process.c: Make symbols static if they're not exported.

(process_tick, update_tick, create_process, chan_process):
(Vprocess_alist, proc_buffered_char, datagram_access):
(fd_callback_data, send_process_frame, process_sent_to): Now static.
(deactivate_process): Mark defn as static, as well as decl.
* lisp.h (create_process): Remove decl.
* process.h (chan_process, Vprocess_alist): Remove decls.

* print.c: Make symbols static if they're not exported.

(print_depth, new_backquote_output, being_printed, print_buffer):
(print_buffer_size, print_buffer_pos, print_buffer_pos_byte):
(print_interval, print_number_index, initial_stderr_stream):
Now static.
* lisp.h (Fprinc): Remove decl.
(debug_output_compilation_hack): Mark as externally visible.

* sysdep.c (croak): Move decl from here to syssignal.h.

* syssignal.h (croak): Put it here, so the API can be checked when
'croak' is called from dissociate_if_controlling_tty.

* minibuf.c: Make symbols static if they're not exported.

(minibuf_save_list, choose_minibuf_frame): Now static.
* lisp.h (choose_minibuf_frame): Remove decl.

* lisp.h (verify_bytepos, count_markers): Mark as externally visible.

* lread.c: Make symbols static if they're not exported.

(read_objects, initial_obarray, oblookup_last_bucket_number):
Now static.
(make_symbol): Remove; unused.
* lisp.h (initial_obarray, make_symbol): Remove decls.

* keyboard.c: Make symbols static if they're not exported.

(single_kboard, recent_keys_index, total_keys, recent_keys):
(this_command_key_count_reset, raw_keybuf, raw_keybuf_count):
(this_single_command_key_start, echoing, last_auto_save):
(read_key_sequence_cmd, dribble, recursive_edit_unwind):
(command_loop, echo_now, keyboard_init_hook, help_char_p):
(quit_throw_to_read_char, command_loop_2, top_level_1, poll_timer):
(Vlispy_mouse_stem, double_click_count):
Now static.
(force_auto_save_soon): Define only if SIGDANGER.
(ignore_mouse_drag_p): Now static if
!defined HAVE_WINDOW_SYSTEM || defined USE_GTK || defined HAVE_NS.
(print_help): Remove; unused.
(stop_character, last_timer_event): Mark as externally visible.
* keyboard.h (ignore_mouse_drag_p): Declare only if
defined HAVE_WINDOW_SYSTEM && !defined USE_GTK && !defined HAVE_NS.
(echo_now, help_char_p, quit_throw_to_read_char): Remove decls.
* lisp.h (echoing): Remove decl.
(force_auto_save_soon): Declare only if SIGDANGER.
* xdisp.c (redisplay_window): Simplify code, to make it more
obvious that ignore_mouse_drag_p is not accessed if !defined
USE_GTK && !defined HAVE_NS.

* intervals.c: Make symbols static if they're not exported.

(merge_properties_sticky, merge_interval_right, delete_interval):
Now static.
* intervals.h (merge_interval_right, delete_interval): Remove decls.

* insdel.c (signal_before_change): Now static.

* insdel.c: Make symbols static if they're not exported.

However, leave prepare_to_modify_buffer alone.  It's never
called from outside this function, but that appears to be a bug.
(combine_after_change_list, combine_after_change_buffer):
(adjust_after_replace): Now static.
(adjust_after_replace_noundo): Remove; unused.
* lisp.h (adjust_after_replace, adjust_after_replace_noundo):
Remove decls.

* indent.c (val_compute_motion, val_vmotion): Now static.

* lisp/minibuffer.el (completion-in-region-mode-predicate)
(completion-in-region-mode--predicate): New vars.
(completion-in-region, completion-in-region--postch)
(completion-in-region-mode): Use them.
(completion--capf-wrapper): Also return the hook function.
(completion-at-point, completion-help-at-point):
Adjust and provide a predicate.

* image.c: Make symbols static if they're not exported.

* dispextern.h (x_create_bitmap_from_xpm_data): Do not declare
if USE_GTK.
* image.c (x_create_bitmap_from_xpm_data): Do not define if USE_GTK.
(xpm_color_cache, ct_table, ct_colors_allocated): Now static.

* fringe.c (standard_bitmaps): Now static.

(max_used_fringe_bitmap): Now static, unless HAVE_NS.

* frame.c: Make symbols static if they're not exported.

(x_report_frame_params, make_terminal_frame): Now static.
(get_frame_param): Now static, unless HAVE_NS.
(x_fullscreen_adjust): Define if WINDOWSNT, not if HAVE_WINDOW_SYSTEM.
(x_get_resource_string): Remove; not used.
* frame.h (make_terminal_frame, x_report_frame_params):
(x_get_resource_string); Remove decls.
(x_fullscreen_adjust): Declare only if WINDOWSNT.
* lisp.h (get_frame_param): Declare only if HAVE_NS.

* font.c, fontset.c: Make symbols static if they're not exported.

* dispextern.h (FACE_SUITABLE_FOR_ASCII_CHAR_P): New macro.
(FACE_SUITABLE_FOR_CHAR_P): Use it.
* font.c (font_close_object): Now static.
* font.h (font_close_object): Remove.
* fontset.c (FONTSET_OBJLIST): Remove.
(free_realized_fontset) #if-0 the body, which does nothing.
(face_suitable_for_char_p): #if-0, as it's never called.
* fontset.h (face_suitable_for_char_p): Remove decl.
* xfaces.c (face_at_string_position): Use
FACE_SUITABLE_FOR_ASCII_CHAR_P, not FACE_SUITABLE_FOR_CHAR_P,
since 0 is always ASCII.

* fns.c (weak_hash_tables): Now static.

* fileio.c: Make symbols static if they're not exported.

(auto_saving, auto_save_mode_bits, auto_save_error_occurred):
(Vwrite_region_annotation_buffers): Now static.

* eval.c: Make symbols static if they're not exported.

(backtrace_list, lisp_eval_depth, when_entered_debugger): Now static.
* lisp.h (backtrace_list): Remove decl.

* emacs.c: Make symbols static if they're not exported.

(malloc_state_ptr, malloc_using_checking, syms_of_emacs):
(fatal_error_code, fatal_error_signal_hook, standard_args):
Now static.
(fatal_error_signal): Now static, unless FLOAT_CATCH_SIGKILL.
(DEFINE_DUMMY_FUNCTION): Mark function as externally visible.
(__CTOR_LIST__, __DTOR_LIST__): Now externally visible.
* lisp.h (fatal_error_signal_hook): Remove decl.
(fatal_error_signal): Declare only if FLOAT_CATCH_SIGKILL.

* editfns.c: Move a (normally-unused) function to its only use.

* editfns.c, lisp.h (get_operating_system_release): Remove.
* process.c (init_process) [DARWIN_OS]: Do it inline, as it is not
worth the hassle of breaking this out.

* xterm.c: Make symbols static if they're not exported.

(x_raise_frame, x_lower_frame, x_wm_set_window_state):
(x_wm_set_icon_pixmap, x_initialize, XTread_socket_fake_io_error):
(x_destroy_window, x_delete_display):
Now static.
(x_dispatch_event): Now static if ! (USE_MOTIF || USE_X_TOOLKIT).
(x_mouse_leave): Remove; unused.
* xterm.h (x_display_info_for_name, x_raise_frame, x_lower_frame):
(x_destroy_window, x_wm_set_window_state, x_wm_set_icon_pixmap):
(x_delete_display, x_initialize, x_set_border_pixel, x_screen_planes):
Remove decls.
(x_mouse_leave): Declare only if WINDOWSNT.
(x_dispatch_event): Declare only if USE_MOTIF or USE_X_TOOLKIT.
(xic_create_fontsetname): Declare only if HAVE_X_WINDOWS &&
USE_X_TOOLKIT.