(wdired-exit): New function.
(wdired-mode-map): Bind C-x C-q to wdired-exit.
(dired-mode-map): Bind C-x C-q to dired-toggle-read-only.
Filter out menu item "Edit File Names" `wdired-change-to-wdired-mode'
when major-mode is not dired-mode.
(dired-toggle-read-only): New function.
(dired-recursive-deletes): Remove obsolete comments about old
default value.
(dired-do-flagged-delete, dired-do-delete): Refill docstring.
(__malloc_initialize): Remove pthread_once.  Not needed.
* tramp.texi (Frequently Asked Questions): Point to mode line
extension in Emacs 23.1.

* trampver.texi: Update release number.
* net/tramp.el:
* net/tramp-uu.el:
* net/trampver.el: Use utf-8 encoding with coding cookie.

* net/tramp-cache.el:
* net/tramp-fish.el:
* net/tramp-ftp.el:
* net/tramp-gw.el:
* net/tramp-smb.el: Remove coding cookie.

* net/tramp.el (tramp-handle-verify-visited-file-modtime): Flush
buffer file-name's file property.
(tramp-handle-file-remote-p): The first parameter is FILENAME.

* net/trampver.el: Update release number.
* term/xterm.el (terminal-init-xterm): Fix merge issue.

* puresize.h (BASE_PURESIZE): Increase.
(copyright-update-year, copyright-update, copyright-fix-years, copyright):
Correctly handle the case where copyright-limit is nil.
(displayed-month): Remove declaration since it's not used here.
(calendar-mode): Make sure displayed-(month|year) are set.
(calendar-basic-setup): Display buffer before adjusting window sizes.
(generate-calendar-window): Use inhibit-read-only.  Simplify.
Generate buffer and set displayed-month and displayed-year before
calling update-calendar-mode-line.
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Remove.
(vc-git-revision-completion-table): Enable.

* vc-hooks.el (vc-handled-backends): Add GIT and HG.

* vc.el (vc-directory-exclusion-list): Add .git and .hg.

* vc-hg.el (vc-hg-revision-completion-table): Re-enable.

* diff-mode.el (diff-mode-menu): New entries.

* diff-mode.el (diff-beginning-of-file-and-junk): New function.
(diff-file-kill): Use it.
(diff-beginning-of-hunk): Add arg `try-harder' using it.
(diff-restrict-view, diff-find-source-location, diff-refine-hunk):
Use it so they find the hunk even when we're in the file header.

* vc.el: Add new VC operation `revision-completion-table'.
(vc-default-revision-completion-table): New function.
(vc-version-diff, vc-version-other-window): Use it to provide
completion of revision names if the backend provides it.

* vc-arch.el (vc-arch--version-completion-table)
(vc-arch-revision-completion-table): New functions to provide
completion of revision names.

* vc-cvs.el: Require CL.
(vc-cvs-revision-table, vc-cvs-revision-completion-table):
New functions to provide completion of revision names.

* eval.c (init_eval_once): Bump max_lisp_eval_depth to 400.

* vc2-xtra.texi (Customizing VC): Add GIT and HG.
Delete stuff that is already on the 22.2 branch.
Change NAKAJI Hiroyuki's e-mail address into the generic one in the 2007-02-28
entry (by his request).
Change NAKAJI Hiroyuki's e-mail address into the generic one in the 2007-02-28
entry (by his request).
Change NAKAJI Hiroyuki's e-mail address into the generic one in the 2007-02-28
entry (by his request).
Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-831
Remove lisp/erc/erc-nicklist.el

This file has been removed because it is not release-quality, and relies
heavily on a module which we cannot distribute with Emacs.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-832
Creator:  Michael Olson <mwolson@gnu.org>
Update some .arch-inventory files

* lib-src/.arch-inventory: Don't track the blessmail binary.

* lisp/emacs-lisp/cl-loaddefs.el: Don't track this.  It is autogenerated.

* lisp/emacs-lisp/.arch-inventory: Don't track cl-loaddefs.el.

* lisp/ps-print.el: Check in trivial changes to the autoloads section
  caused by the build process.  These autoloads really ought to be placed
  in a separate file, methinks.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-833
Creator:  Michael Olson <mwolson@gnu.org>
Fix void function definition error in cus-edit.el

2007-07-30  Michael Olson  <mwolson@gnu.org>

	* cus-edit.el (custom-group-save): Fix void function definition
	error.  Thanks to Zhang Wei for the report.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-834
Creator:  Michael Olson <mwolson@gnu.org>
Remove lisp/erc/erc-nicklist.el

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-832
   Remove lisp/erc/erc-nicklist.el

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-76
Creator:  Michael Olson <mwolson@gnu.org>
Update some .arch-inventory files

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-77
Creator:  Michael Olson <mwolson@gnu.org>