2007-06-12  Michael Kifer  <kifer@cs.stonybrook.edu>

* viper-cmd.el (viper-prefix-arg-com,viper-prefix-arg-value): display
error messages
(viper-prev-destructive-command,viper-insert-prev-from-insertion-ring):
get rid of cl.el dependencies.

* viper-init.el (viper-suppress-input-method-change-message): new
variable.
(viper-activate-input-method-action,viper-inactivate-input-method-action):
use viper-suppress-input-method-change-message.

* viper-kem.el (viper-vi-basic-map): disable the bindings for C-s, C-r.

* viper-util.el (viper-set-cursor-color-according-to-state): use
viper-replace-overlay-cursor-color instead of
viper-replace-overlay-cursor-color.
(viper-sit-for-short): use sit-for with 3 arguments.

* viper.el (viper-insert-state-mode-list): add gud-mode.
(viper-major-mode-modifier-list): add viper-comint-mode-modifier-map to
gud-mode.

* ediff-mult.el
(ediff-meta-buffer-brief-message,ediff-meta-buffer-verbose-message):
new variables.
(ediff-meta-buffer-message): variable deleted.
(ediff-verbose-help-enabled): new variable.
(ediff-toggle-verbose-help-meta-buffer): new function.
(ediff-redraw-directory-group-buffer): made aware of short/verbose
message options

* ediff-ptch.el (ediff-context-diff-label-regexp): better regexp.
(ediff-fixup-patch-map): improved heuristic.

(log-view-file-re, log-view-message-re): Use \(?1:...\).
(log-view-font-lock-keywords): Simplify.
(log-view-current-file, log-view-current-tag): Simplify.

(regex_compile): Remove the `regnum' counter.
Use bufp->re_nsub instead.  Add support for \(?N:RE\).

(url-cookie-name, url-cookie-value, url-cookie-expires, url-cookie-localpart)
(url-cookie-domain, url-cookie-secure, url-cookie-set-name)
(url-cookie-set-value, url-cookie-set-expires, url-cookie-set-localpart)
(url-cookie-set-domain, url-cookie-set-secure, url-cookie-retrieve-arg)
(url-cookie-create, url-cookie-p): Remove.
(url-cookie): New struct.
(url-cookie-store): Use setf instead of url-cookie-set-*.

(tab-always-indent): Docstring fix.

(vc-arch-command): Also try "baz" and "bzr".

(desktop-load-locked-desktop): New option.
(desktop-read): Use it.
(desktop-truncate, desktop-outvar, desktop-restore-file-buffer): Use `when'.

(desktop-save-mode-off): New function.
(desktop-base-lock-name, desktop-not-loaded-hook): New variables.
(desktop-full-lock-name, desktop-file-modtime, desktop-owner,
desktop-claim-lock, desktop-release-lock): New functions.
(desktop-kill): Tell `desktop-save' that this is the last save.
Release the lock afterwards.
(desktop-buffer-info): New function.
(desktop-save): Use it.  Run `desktop-save-hook' where the doc says to.
Detect conflicts, and manage the lock.
(desktop-read): Detect conflicts.  Manage the lock.

Change bug address.  Add back +++/--- note.
Use present tense for X-toolkit entry.  Mention libgif.

Restore two items deleted by mistake.

(HAVE_GIF): Doc fix.
(LIBGIF): New (already used by Makefile.in).

(HAVE_GIF): If -lungif fails, try -lgif.

(tpu-emacs-map-key): Use new keymap names.

(tpu-gold-map): Rename from GOLD-map.
(tpu-lucid-emacs-p): Remove.  Use (featurep 'xemacs) instead.
(CSI-map, GOLD-CSI-map, GOLD-SS3-map, SS3-map): Delete vars.
(tpu-gold-map, tpu-global-map): Add all the SS3 and CSI bindings, using
keysyms rather than byte sequences.
(tpu-copy-keyfile): Don't force the user to use tpu-mapper.el.

(sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
(sh-font-lock-syntactic-keywords): Use them to distinguish the
different possible cases for \'.

(PC-bindings): Don't bind things already bound in the parent keymap.

Adjust copyright notice.

*** empty log message ***

New file.

Include intervals.h to declare Fget_text_property.

*** empty log message ***

(vc-svn-program): New var.
(vc-svn-command): Use it.

*** empty log message ***

Change wording about yes/gtk and lucid/athena being
synonyms.

Remove RCS keywords

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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 227-228)

   - Update from CVS

2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-ems.el (gnus-x-splash): Make it work.

   * lisp/gnus/gnus-start.el (gnus-1): Relax restrictions that prevent gnus-x-splash
   from being used.

   * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave): Correct the order
   of the arguments passed to pop-to-buffer.
   (gnus-article-read-summary-keys): Ditto.

2007-06-06  Andreas Seltenreich  <andreas@gate450.dyndns.org>

   * man/gnus.texi (Misc Group Stuff, Summary Buffer)
   (Server Commands, Article Keymap): Fix typo.  s/function/command/.

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

(server-switch-buffer): Remove redundant check.

(Fx_file_dialog): Take size from struct not pointer.

(byte-compile-find-cl-functions): Match
against file-name-nondirectory.
Fix text on user customization variables.

Regenerate, and apply by hand super-special-shell-function-message-patch.

(rmail-movemail-variant-in-use): Fix doc typo.

Merge from emacs--rel--22

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

*** empty log message ***

(desktop-minor-mode-table): Doc fix.

(css-navigation-syntax-table):
Use set-char-table-range so it also works in the unicode branch.

(Fdelete_and_extract_region): Use empty_unibyte_string.

(Fread_file_name): Use empty_unibyte_string.

(Fmapconcat): Use empty_unibyte_string.

(cmd_error_internal): Use empty_unibyte_string.

(Fkey_description): Use empty_unibyte_string.

(read_minibuf): Use empty_unibyte_string.

(wordify): Use empty_unibyte_string.

(sel_read): Use empty_unibyte_string.

(Fx_get_atom_name): Use empty_unibyte_string.

(x_term_init): Use empty_unibyte_string.

(Fformat_mode_line, syms_of_xdisp): Use empty_unibyte_string.

(x_default_scroll_bar_color_parameter):
Use empty_unibyte_string, not empty_string.

(menu_help_callback): Use empty_unibyte_string, not empty_string.

(init_strings): Initialize canonical empty strings.
(make_uninit_string, make_uninit_multibyte_string): Return appropriate
canonical empty string when the requested size is 0.

(empty_unibyte_string): Rename from empty_string.
(empty_multibyte_string): New canonical empty string.
(syms_of_emacs): Don't initialize empty_string.

(syms_of_lread, openp): Use empty_unibyte_string, not build_string.

(STRING_SET_UNIBYTE): Return the canonical empty unibyte string, if appropriate.
(empty_unibyte_string, empty_multibyte_string): New externs.
(empty_string): Remove extern.

(Optional Mode Line): Document the new form of line+column numbers,
"(561,2)".

*** empty log message ***

(help-xref-forward-stack)
(help-xref-stack-forward-item, help-forward-label): New variables.
(help-forward): New button type.
(help-setup-xref): Initialise help-xref-forward-stack.
(help-make-xrefs): Add forward button, if appropriate.
(help-xref-go-back): Push item on forward stack.
(help-xref-go-forward, help-go-forward): New functions.

*** empty log message ***

*** empty log message ***

Make gtk the default toolkit.

*** empty log message ***

Remove FIXME comment, implemented in previous change.

(Fcurrent_time_zone): Remove hack for Japanese Windows.

Don't define HAVE_TZNAME.

Tramp does not require cl anymore.

Tramp does not require cl anymore.

Sync with Tramp 2.0.56.

Identify Emacs 22.2 changes (so we don't lose them later).

(dired-recursive-deletes, dired-recursive-copies): Change default to
`top'.

* dired.el (dired-recursive-deletes, dired-recursive-copies):
Change default to `top'.

(dired-mode-map): Remove spurious separator.

* dired.el (dired-mode-map): Remove spurious separator.

(dired-mode-map): Remove spurious separator.

* dired.el (dired-mode-map): Remove spurious separator.

(gnus-split-methods): Fix typo in docstring.

(gnus-split-methods): Fix typo in docstring.

(mixal-operation-codes-alist): Fix typo in docstring.

(mixal-operation-codes-alist): Fix typo in docstring.

(Optional Mode Line): Document the new form of line+column numbers,
"(561,2)".

*** empty log message ***

(ebrowse-draw-file-member-info): Doc fix.

(ebrowse-draw-file-member-info): Doc fix.

*** empty log message ***

(idlwave-one-key-select): Fix typo in docstring.

(idlwave-one-key-select): Fix typo in docstring.

Version number fixed.

*** empty log message ***

(mac_get_window_bounds): Move extern from macfns.c.
(FRAME_OUTER_TO_INNER_DIFF_X, FRAME_OUTER_TO_INNER_DIFF_Y): New macros.

(mac_begin_cg_clip): New arg F.  Call SetPortWindowPort.
All callers changed so as not to call SetPortWindowPort.
(mac_begin_cg_clip) [USE_CG_DRAWING]: Call mac_prepare_for_quickdraw.
(mac_draw_image_string_atsui) [USE_ATSUI]: New function created from
mac_draw_string_common.
(mac_draw_image_string_qd): Likewise.
(mac_draw_string_common): Use them.  Add INLINE.
(XTmouse_position, x_scroll_bar_report_motion) [TARGET_API_MAC_CARBON]:
Use FRAME_OUTER_TO_INNER_DIFF_X, FRAME_OUTER_TO_INNER_DIFF_Y, and
GetGlobalMouse.
(x_set_mouse_pixel_position) [MAC_OSX]: Use FRAME_OUTER_TO_INNER_DIFF_X
and FRAME_OUTER_TO_INNER_DIFF_Y.
[TARGET_API_MAC_CARBON] (mac_handle_mouse_event): Likewise.
[USE_MAC_TSM] (mac_handle_text_input_event): Likewise.
(x_make_frame_visible) [TARGET_API_MAC_CARBON]: Move code for
repositioning window to mac_handle_window_event.
(x_make_frame_invisible) [TARGET_API_MAC_CARBON]: Move code for
saving window location to mac_handle_window_event
[USE_MAC_FONT_PANEL] (mac_show_hide_font_panel): Install handler here.
(install_menu_target_item_handler): Remove argument in extern.
[TARGET_API_MAC_CARBON] (mac_event_to_emacs_modifiers):
Also accept command events.
(do_keystroke): New function created from XTread_socket.
(init_command_handler): Remove functions.
[TARGET_API_MAC_CARBON] (mac_handle_window_event): Reposition window
and save window location by kEventWindowShowing and kEventWindowHiding
handlers here.  Don't call next handler for window state change and
focus events.
(mac_handle_application_event, mac_handle_keyboard_event)
[TARGET_API_MAC_CARBON]: New functions.
(install_window_handler) [TARGET_API_MAC_CARBON]: Register handlers for
kEventWindowShowing and kEventWindowHiding events.  Move installation
of mouse, font, text input and menu target item handlers to
install_application_handler.
(install_application_handler) [TARGET_API_MAC_CARBON]: New function.
(mac_handle_cg_display_reconfig) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
New function.
(init_dm_notification_handler) [MAC_OS_X_VERSION_MAX_ALLOWED >= 1030]:
Register it.
(XTread_socket) [TARGET_API_MAC_CARBON]: Consolidate
SendEventToEventTarget calls.  Use FRAME_OUTER_TO_INNER_DIFF_X and
FRAME_OUTER_TO_INNER_DIFF_Y.  Move application activation handler
to mac_handle_application_event.  Move keyboard handler to
mac_handle_keyboard_event.
(XTread_socket) [!TARGET_API_MAC_CARBON]: Use do_keystroke.
(mac_initialize) [TARGET_API_MAC_CARBON]: Don't call
init_command_handler.  Call install_application_handler.

[MAC_OSX] (install_service_handler): Rename from
init_service_handler.  All callers changed.  Return OSStatus value.

[TARGET_API_MAC_CARBON] (menu_target_item_handler):
Don't call next handler.
[TARGET_API_MAC_CARBON] (install_menu_target_item_handler):
Remove argument.  Install handler to application.
(set_frame_menubar): Don't change deep_p.
(mac_menu_show):  Use FRAME_OUTER_TO_INNER_DIFF_X and
FRAME_OUTER_TO_INNER_DIFF_Y.
(DIALOG_BUTTON_COMMAND_ID_OFFSET, DIALOG_BUTTON_COMMAND_ID_P)
(DIALOG_BUTTON_COMMAND_ID_VALUE, DIALOG_BUTTON_MAKE_COMMAND_ID)
[HAVE_DIALOGS]: New macros.
[HAVE_DIALOGS] (mac_handle_dialog_event, create_and_show_dialog):
Use them.
(fill_menubar) [TARGET_API_MAC_CARBON]: Use CFString.

(mac_get_window_bounds): Move extern to macterm.h.
(compute_tip_xy) [TARGET_API_MAC_CARBON]: Use GetGlobalMouse.

(xrm_get_preference_database): Remove BLOCK_INPUT.

Add links to message lists for Xaw3d issue.

(install-arch-indep): Install only the DOC- file specific to the
build, if possible, rather than DOC-*.

*** empty log message ***

NON_GNU_CPP on Solaris done in 2007-06-07 change to configure.in.

(NON_GNU_CPP): On Solaris, set using a proper check for a Sun C
compiler.

Fix typo in previous change.

Sync etc/images change to six icons from trunk.

Convert from PPM to PBM.

Convert from PGM to PBM.

Sync 2007-05-19 change from trunk.