(XDrawLine) [MAC_OS]: Remove macro.
(XCreateGC_pixmap) [!HAVE_NTGUI]: Likewise.
(x_disable_image) [!HAVE_NTGUI]: Use XCreateGC instead of
XCreateGC_pixmap.

(Fcall_process_region) [HAVE_MKSTEMP]: Add BLOCK_INPUT
around mkstemp.

(select-safe-coding-system-interactively): Fix message.

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 186-191)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-595

* net/tramp.el: (tramp-process-one-action): Remove `with-timeout'.
(tramp-process-actions): Add optional parameter TIMEOUT.
(tramp-open-connection-telnet, tramp-open-connection-rsh)
(tramp-open-connection-su): Add timeout of 60".

(tumme-display-thumb): Doc fix.

(compile): Doc fix.

(vhdl-save-caches): Fix typo in error message.

(mac-dnd-types-alist): Fix typo in docstring.

(icalendar-import-buffer): Fix typo in docstring.

(x-dnd-types-alist): Fix typo in docstring.

(battery-search-for-one-match-in-files): Fix typo in docstring.

(init_keyboard): Initialize interrupt_input_blocked and
interrupt_input_pending.

(x_display_info): New: net_supported_atoms,
nr_net_supported_atoms and net_supported_window.

New variable last_user_time.
(handle_one_xevent): Set last_user_time from events that have Time.
Set net_supported_window to 0 when reparented.
(wm_supports): New function.
(do_ewmh_fullscreen): Use wm_supports to check for _NET_WM_STATE.
(x_term_init): Initialize net_supported_atoms, nr_net_supported_atoms
and net_supported_window.

(fill-comment-paragraph): Improve comment.

(replace-regexp): Fix typo in docstring.

(c-operators, c-filter-ops): Amend doc-string and comments.

*** empty log message ***

(abbreviate-file-name): Doc fix.

*** empty log message ***

(split-string): Remove spurious ")" from doc string.

Mention the change in ctags wrt duplicate tags.

Fix date of last entry.

Add missing :group in previous change.

Regenerate to remove obsolete entries.

*** empty log message ***

*** empty log message ***

(table--warn-incompatibility):
Use display-warning instead of momentary-string-display.

(image-type-header-regexps): Recognize xbm more strictly.

(backward-kill-word): Doc fix.

*** empty log message ***

(Antinews): Mention M-x shell scrolling.

(Defining Minor Modes): Fix previous change.

(momentary): Move here ...

Delete item about `sgml-html-meta-auto-coding-function'.

(sgml-html-meta-auto-coding-function): Ensure that the buffer contains a
HTML document.

* faces.el (momentary): Move here ...
* subr.el (momentary): ... from here.

(Fvertical_motion): Fix IT overshoot check for overlay
strings without embedded newlines immediately followed by newline.

*** empty log message ***

(gnus-soup): New custom group.  Make user variables customizable.

(MAC_EMACS_CREATOR_CODE): New enumerator.

(CG_SET_FILL_COLOR_MAYBE_WITH_CGCOLOR)
(CG_SET_FILL_COLOR_WITH_GC_FOREGROUND)
(CG_SET_FILL_COLOR_WITH_GC_BACKGROUND)
(CG_SET_STROKE_COLOR_MAYBE_WITH_CGCOLOR)
(CG_SET_STROKE_COLOR_WITH_GC_FOREGROUND): New macros.
(mac_cg_color_space_rgb) [USE_CG_DRAWING]: New variable.
(mac_cg_color_black) [USE_CG_DRAWING
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: New variable.
(init_cg_color) [USE_CG_DRAWING]: New function.
(mac_draw_line, mac_draw_rectangle) [USE_CG_DRAWING]: Use
CG_SET_STROKE_COLOR_WITH_GC_FOREGROUND instead of CG_SET_STROKE_COLOR.
(mac_erase_rectangle, mac_clear_window, mac_draw_cg_image)
(mac_fill_rectangle, mac_draw_image_string_cg) [USE_CG_DRAWING]:
Use CG_SET_FILL_COLOR_WITH_GC_FOREGROUND or
CG_SET_FILL_COLOR_WITH_GC_BACKGROUND instead of CG_SET_FILL_COLOR.
(mac_draw_string_common) [MAC_OSX && USE_ATSUI]: Likewise.
(XCreateGC, XFreeGC, XSetForeground, XSetBackground) [USE_CG_DRAWING
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: Use gc->cg_fore_color and/or
gc->cg_back_color.
(install_drag_handler, remove_drag_handler): Make extern.
(install_menu_target_item_handler): Add extern.
(install_window_handler): Call install_menu_target_item_handler.
[MAC_OS8] (main): Use MAC_EMACS_CREATOR_CODE instead of 'EMAx'.
(mac_initialize) [USE_CG_DRAWING]: Call init_cg_color.

(Vshow_help_function) [TARGET_API_MAC_CARBON]: Add extern.
(restore_show_help_function, menu_target_item_handler)
[TARGET_API_MAC_CARBON]: New functions.
(install_menu_target_item_handler): New function.
(add_menu_item) [TARGET_API_MAC_CARBON]: Set help string as menu
item property.

(struct _XGC) [USE_CG_DRAWING
&& MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]: New members cg_fore_color
and cg_back_color.

(Fmac_set_file_creator): Use MAC_EMACS_CREATOR_CODE
instead of 'EMAx'.
[!MAC_OSX] (sys_open, sys_creat, sys_fopen): Likewise.

(Fformat_time_string, Fdecode_time, Fencode_time)
(Fcurrent_time_string, Fcurrent_time_zone): Add BLOCK_INPUT around
gmtime/localtime/emacs_memftimeu/mktime.

(Watch Expressions): Describe gdb-max-children.

*** empty log message ***

(gdb-max-children): New customizable variable.
(gdb-speedbar-expand-node): Ask user for confirmation before expanding
large structures/arrays.

Update from erc--emacs--22

Highlights:
 - New /RECONNECT command.
 - Improve default method for auto-identify to nickserv.
 - Fix another erc-iswitchb bug.
 - Fix reconnect lockup (defaulting to twice before giving up).
 - Fix reconnect on ban.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-587
Creator:  Michael Olson <mwolson@gnu.org>

*** empty log message ***

(find-file-noselect-1, set-visited-file-name):
Allow backup-enable-predicate to be nil.

(momentary): New face.
(momentary-string-display): Display the string via a temporary
overlay using the new face, instead of inserting it in the buffer.

Change C-c b to C-c C-m.

*** empty log message ***

(Windows Keyboard): Clarify previous change.

*** empty log message ***

(ebrowse-global-prefix-key): Fix typo in
last change.

(Fwindow_end): Fix use of >= operator.

*** empty log message ***

Detect and use fink-installed in intel-based Mac builds; change Apple
Darwin section to support both PowerPC and Intel-based Macs.

(Fwindow_end): Check BUF_OVERLAY_MODIFF like BUF_MODIFF.

(woman-decode-buffer): Clarify error message.

(Variable Definitions, Customization Types):
Don't use * in doc string for defcustom.

*** empty log message ***

(c-mask-paragraph): Fix yesterday's buggy patch.

*** empty log message ***

(tutorial--describe-nonstandard-key): Fix typo.

(Customizing Articles): Use index entries for gnus-treat-*
variables only in info to avoid redundant entries in the printed
manual.

(iswitchb-global-map): Use command-remapping if available.

(viper-custom-file-name, viper-mode): Fix typos in docstrings.

(momentary-string-display): After moving point, set POS variable to it to avoid
later errors once the buffer is modified.  Doc fix.

*** empty log message ***

(widget-choose): Avoid ugly error for function keys.

Whitespace change.

Add license notice.

(Changing a Variable): Minor clarification.
(Specific Customization): customize-customized => customize-unsaved.

*** empty log message ***

(Entering Emacs): Clean up text about restarting Emacs for each file.

(Shell Options): Minor cleanup.

(Windows Keyboard): Explain that Windows was incompatible
with Emacs, not vice versa.

(Symbol Completion): Recommend customizing window manager.

(Resources): Minor fix.

(Variable Aliases): Clarify that aliases vars always have the same value.

(Bindat Spec): Fix Texinfo usage.

(Defining Minor Modes): Explain effect of command
defined with define-global-minor-mode on new buffers.

(cfengine-font-lock-syntactic-keywords): Fix format of value.

(customize-unsaved): Renamed from customize-customized.
Change messages accordingly.
(customize-customized): Now alias.

(c-mask-paragraph): In a block comment, check that the "*/" is present
before trying to manipulate the "*/".

(Using PGP/MIME): Document gpg-agent usage.
(Security): Split into sub-nodes.

Add c-file-style local binding.

*** empty log message ***

(xg_menu_item_cb_data_): Remove highlight_id and
unhighlight_id.

(menuitem_highlight_callback): Invoked widget is the
parent of the menu item.  Get menu item widget from event.
(xg_create_one_menuitem, xg_update_menu_item): highlight_id and
unhighlight_id has been removed.
(create_menus): Connect enter/leave-notify-event to the menu instead
of individual items.

*** empty log message ***

*** empty log message ***

(main): Pass the -u option to sort in ctags mode.

Remove references to the --no-warn option, which is now undocumented.

(longopts): New undocumented option --no-duplicates.
(no_duplicates): Static variables for the above option.
(print_help): Do not print help for --no-warn, now undocumented.
(add_node): Allow duplicate tags in ctags mode unless --no-duplicates.