diff lisp/ChangeLog @ 108450:de8a1b891175

Merge from mainline.

--- a/lisp/ChangeLog	Fri Apr 09 12:36:12 2010 +0000
+++ b/lisp/ChangeLog	Sun Apr 11 10:53:01 2010 +0000
@@ -1,3 +1,81 @@
[phone]  Jari Aalto  <[e-mail]>
+
+	* comint.el (comint-password-prompt-regexp): Use regexp-opt, and
+	recognize ssh-keygen prompt (Bug#2817).
+
[phone]  Michael Albinus  <[e-mail]>
+
+	* net/tramp.el (tramp-do-copy-or-rename-file): Add progress reporter.
+
[phone]  Michael Albinus  <[e-mail]>
+
+	Synchronize with Tramp repository.
+
+	* net/tramp.el (tramp-completion-function-alist)
+	(tramp-file-name-regexp, tramp-chunksize)
+	(tramp-local-coding-commands, tramp-remote-coding-commands): Fix
+	docstring.
+	(tramp-remote-process-environment): Use `format' instead of
+	`concat'.
+	(tramp-handle-directory-files-and-attributes)
+	(tramp-get-remote-path): Use `copy-tree'.
+	(tramp-handle-file-name-all-completions): Backward/ XEmacs
+	compatibility: Use `completion-ignore-case' if
+	`read-file-name-completion-ignore-case' does not exist.
+	(tramp-do-copy-or-rename-file-directly): Do not use
+	`tramp-handle-file-remote-p'.
+	(tramp-do-copy-or-rename-file-out-of-band): Use
+	`tramp-compat-delete-directory'.
+	(tramp-do-copy-or-rename-file-out-of-band)
+	(tramp-compute-multi-hops, tramp-maybe-open-connection): Use
+	`format-spec-make'.
+	(tramp-find-foreign-file-name-handler)
+	(tramp-advice-make-auto-save-file-name)
+	(tramp-set-auto-save-file-modes): Remove superfluous check for
+	`stringp'.  This is done inside `tramp-tramp-file-p'.
+	(tramp-debug-outline-regexp): New defconst.
+	(tramp-get-debug-buffer): Use it.
+	(tramp-check-for-regexp): Use (forward-line 1).
+	(tramp-set-auto-save-file-modes): Adapt version check.
+
+	* net/tramp-compat.el (tramp-advice-file-expand-wildcards): Wrap
+	call of `featurep' for 2nd argument.
+	(tramp-compat-make-temp-file): Simplify fallback implementation.
+	(tramp-compat-copy-tree): Remove function.
+	(tramp-compat-delete-directory): Provide implementation for older
+	Emacsen.
+
+	* net/tramp-fish.el (tramp-fish-handle-directory-files-and-attributes):
+	Do not use `tramp-fish-handle-file-attributes.
+
+	* net/trampver.el: Update release number.
+
[phone]  Glenn Morris  <[e-mail]>
+
+	* progmodes/compile.el (compilation-save-buffers-predicate):
+	Add missing :version tag.
+
[phone]  Sam Steingold  <[e-mail]>
+
+	* progmodes/compile.el (compilation-save-buffers-predicate):
+	Remove the "autoload" cookie.
+
+	* progmodes/bug-reference.el (turn-on-bug-reference-mode)
+	(turn-on-bug-reference-prog-mode): Remove, `bug-reference-mode'
+	and `bug-reference-prog-mode' can be used in hooks directly.
+
[phone]  Dan Nicolaescu  <[e-mail]>
+
+	Add --author support to git commit.
+	* vc-git.el (vc-git-checkin): Pass extra-args to the commit command.
+	(vc-git-log-edit-mode): New minor mode.
+	(log-edit-mode, log-edit-extra-flags, log-edit-mode): New
+	declarations.
+
[phone]  Eric Raymond  <[e-mail]>
+
+	* vc-hooks.el, vc-git.el: Improve documentation comments.
+
 2010-04-08  Stefan Monnier  <[e-mail]>
 
 	Fix some of the problems in defsubst* (bug#5728).