* 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.

* sysdep.c (MAX_RW_COUNT): New macro, to work around kernel bugs.

(emacs_read, emacs_write): Use it.

* process.c (send_process): Count partial writes as successes.

See http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00483.html

Preserve arg names for advice of subr and lexical functions.
* lisp/help-fns.el (help-function-arglist): Consolidate the subr and
new-byte-code cases.  Add argument `preserve-names' to extract names
from the docstring when needed.
* lisp/emacs-lisp/advice.el (ad-define-subr-args, ad-undefine-subr-args)
(ad-subr-args-defined-p, ad-get-subr-args, ad-subr-arglist): Remove.
(ad-arglist): Use help-function-arglist's new arg.
(ad-definition-type): Use cond.

Fixes: debbugs:8457

Fix bug #8487 with invisible text at EOB under bidi.

 src/xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
 when at ZV.

Fix bug #8487 with invisible property near EOB under bidi.

 src/xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
 when at ZV.

lisp/autorevert.el: Use `remote-file-name-inhibit-cache'.

* autorevert.el (auto-revert-handler):
  Bind `remote-file-name-inhibit-cache', not `tramp-cache-inhibit-cache',
  which was removed in 2010-10-02T13:21:43Z!michael.albinus@gmx.de.
  Don't quote lambda.

Fix typos.

emacs_write: Return size_t, not ssize_t, to avoid overflow issues.

* gnutls.c, gnutls.h (emacs_gnutls_write): Return size_t, not ssize_t.
* sysdep.c, lisp.h (emacs_write): Likewise.
Without the above change, emacs_gnutls_write and emacs_write had
undefined behavior and would typically mistakenly report an error
when writing a buffer whose size exceeds SSIZE_MAX.
(emacs_read, emacs_write): Remove check for negative size, as the
Emacs source code has been audited now.
(emacs_write): Adjust to new signature, making the code look more
like that of emacs_gnutls_write.
* process.c (send_process): Adjust to the new signatures of
emacs_write and emacs_gnutls_write.  Do not attempt to store
a byte offset into an 'int'; it might overflow.

* sound.c: Don't assume sizes fit in 'int'.

(struct sound_device.period_size, alsa_period_size):
Return size_t, not int.
(struct sound_device.write, vox_write, alsa_write):
Accept size_t, not int.
(wav_play, au_play): Use size_t to store sizes, and ssize_t to
record read return values.

lisp/image-mode.el: Fix change in 2011-04-09T20:28:01Z!cyd@stupidchicken.com.

Merge changes made in Gnus trunk.

gnus.texi (Window Layout): @itemize @code doesn't exist.  It's @table @code.
gnus-registry.el (gnus-registry--split-fancy-with-parent-internal): Fix logic bug.
 (gnus-registry-post-process-groups): Fix logging of no results and quote sender and subject.
network-stream.el (network-stream-open-starttls): Only do opportunistic STARTTLS upgrades if we have built-in gnutls support.  Upgrades via gnutls-cli are too slow to be done opportunistically.
gnus-start.el (gnus-get-unread-articles): Slight cleanup.
 (gnus-read-active-for-groups): Don't try to finish getting stuff where we had no early-data returned.
 (gnus-get-unread-articles): Add a sanity check so that we don't issue two async commands to the same server at the same time.
gnus-sum.el (gnus-summary-select-article-buffer): Doc fix.
gnus-registry.el (gnus-registry-remake-db): Put the warning on a "warning" level.

lisp/dframe.el (dframe-current-frame): Remove spurious quote.

mm-url.el (mm-url-package-name): Removed to ease third-party reuse.
 (mm-url-insert-file-contents): Don't set the package names.

lisp/ChangeLog: Fix date of entry.

Use xfree instead of free where appropriate (Bug#8437)

* charset.c (Fclear_charset_maps): Use xfree instead of free.
(Bug#8437)
* keyboard.c (parse_tool_bar_item): Likewise.
* sound.c (sound_cleanup, alsa_close): Likewise.
* termcap.c (tgetent): Likewise.
* xfns.c (x_default_font_parameter): Likewise.
* xsettings.c (read_and_apply_settings): Likewise.

* alloc.c (overrun_check_malloc, overrun_check_realloc)
(overrun_check_free): Protoize.

Auto-commit of generated files.

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

(ftxfont_driver): Export only if !defined HAVE_XFT && def8ined
HAVE_FREETYPE.
* font.h (ftxfont_driver): Likewise.

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

(x_last_font_name, x_display_info_for_name):
(x_set_foreground_color, x_set_background_color, x_set_mouse_color):
(x_set_cursor_color, x_set_border_pixel, x_set_border_color):
(x_set_cursor_type, x_set_icon_type, x_set_icon_name):
(x_set_scroll_bar_foreground, x_set_scroll_bar_background):
(x_explicitly_set_name, x_set_title, xic_defaut_fontset, tip_timer):
(last_show_tip_args): Now static.
(xic_defaut_fontset, xic_create_fontsetname): Define only if
defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT
(x_screen_planes): Remove; unused.
* dispextern.h (x_screen_planes): Remove decl.

* sysdep.c (emacs_read, emacs_write): Check for negative sizes

since callers should never pass a negative size.
Change the signature to match that of plain 'read' and 'write'; see
<http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00397.html>.
* lisp.h: Update prototypes of emacs_write and emacs_read.

Small cal-tex fix.

* lisp/calendar/cal-tex.el (cal-tex-end-document):
Try to automatically use latin1 input if needed.

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

* dispextern.h (redraw_garbaged_frames, scrolling):
(increment_row_positions): Remove.
* dispnew.c (new_glyph_matrix, increment_row_positions, scrolling):
(delayed_size_change, glyph_matrix_count, glyph_pool_count):
Now static.
(redraw_garbaged_frames): Remove; unused.

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

* dispextern.h (ascii_face_of_lisp_face, free_realized_face):
Remove decls.
* xterm.h (defined_color): Remove decls.
(x_free_dpy_colors): Declare only if USE_X_TOOLKIT.
* xfaces.c (tty_suppress_bold_inverse_default_colors_p):
(menu_face_changed_default, defined_color, free_realized_face):
(x_free_dpy_colors): Define only if USE_X_TOOLKIT.
(ascii_face_of_lisp_face): Remove; unused.

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

* dispextern.h (scratch_glyph_row, window_box_edges):
(glyph_to_pixel_coords, set_cursor_from_row):
(get_next_display_element, set_iterator_to_next):
(highlight_trailing_whitespace, frame_to_window_pixel_xy):
(show_mouse_face): Remove decls
* frame.h (message_buf_print): Likewise.
* lisp.h (pop_message, set_message, check_point_in_composition):
Likewise.
* xterm.h (set_vertical_scroll_bar): Likewise.
* xdisp.c (list_of_error, Vmessage_stack, line_number_displayed):
(message_buf_print, scratch_glyph_row, displayed_buffer):
(set_iterator_to_next, pop_message, set_message, set_cursor_from_row):
(get_next_display_element, show_mouse_face, window_box_edges):
(frame_to_window_pixel_xy, check_point_in_composition):
(set_vertical_scroll_bar, highlight_trailing_whitespace): Now static.
(glyph_to_pixel_coords): Remove; unused.

* dired.c (file_name_completion): Now static.

* dbusbind.c (xd_in_read_queued_messages): Now static.

* lisp.h (circular_list_error, FOREACH): Remove; unused.

* data.c (circular_list_error): Remove.

cal-hebrew fix for diary-hebrew-rosh-hodesh.

* lisp/calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
Don't try to cons a mark onto an empty element.

Recipe showing the problem:
~/diary:
&%%(diary-rosh-hodesh)
&%%(diary-parasha)

emacs -Q --eval "(progn (add-hook 'diary-nongregorian-listing-hook
   'diary-hebrew-list-entries) (setq cal-tex-diary t))" -f calendar

Move to Jan 2011, press `t m', latex the generated file.

[Port to 23.4]

ImageMagick fix for bug#7955.

* configure.in: Require ImageMagick >= 6.2.8.  (Bug#7955)

* etc/NEWS: Mention ImageMagick version.