merge trunk

5 files changed, 23 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48b5581d8a..f7960c1d74 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-16  Chong Yidong  <[email protected]>
+
+	* mail/sendmail.el: Add "*unsent mail*" to
+	same-window-buffer-names.
+
+	* term/x-win.el (x-cut-buffer-or-selection-value): Define as
+	obsolete alias for x-selection-value.
+
+	* ido.el (ido-make-buffer-list): Fix error in 2010-08-22 merge.
+
+2010-09-16  Michael Albinus  <[email protected]>
+
+	* net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload
+	cookie.
+
 2010-09-15  Michael Albinus  <[email protected]>
 
 	* net/tramp-compat.el (tramp-compat-with-temp-message)
@@ -9,7 +24,7 @@
 	* net/tramp-cache.el (top): Use `tramp-compat-font-lock-add-keywords'.
 
 	* net/tramp.el (tramp-progress-reporter-update): Use
-	`tramp-compat-funcall.
+	`tramp-compat-funcall'.
 
 	* net/tramp.el (tramp-process-actions):
 	* net/tramp-gvfs.el (tramp-handle-vc-registered):
diff --git a/lisp/ido.el b/lisp/ido.el
index 858ee3ed5b..2df9b8666a 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -3403,6 +3403,8 @@ for first matching file."
     (if default
         (setq ido-temp-list
               (cons default (delete default ido-temp-list))))
+    (if ido-use-virtual-buffers
+	(ido-add-virtual-buffers-to-list))
     (run-hooks 'ido-make-buffer-list-hook)
     ido-temp-list))
 
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 3cc1bf5fe1..d802b75ee0 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1663,6 +1663,7 @@ If the current line has `mail-yank-prefix', insert it on the new line."
 ;; in middle of loading the file.
 
 ;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*mail*"))
+;;;###autoload (add-hook 'same-window-buffer-names (purecopy "*unsent mail*"))
 
 ;;;###autoload
 (defun mail (&optional noerase to subject in-reply-to cc replybuffer actions)
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 32cbb16b9e..5937a737b9 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -50,6 +50,7 @@
 	  x)))
     (buffer-list))))
 
+;;;###tramp-autoload
 (defun tramp-cleanup-connection (vec)
   "Flush all connection related objects.
 This includes password cache, file cache, connection cache, buffers.
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index b19e0f854d..1950bef19b 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1344,6 +1344,9 @@ The value nil is the same as this list:
       (or clip-text primary-text)
       )))
 
+(define-obsolete-function-alias 'x-cut-buffer-or-selection-value
+  'x-selection-value "24.1")
+
 ;; Arrange for the kill and yank functions to set and check the clipboard.
 (setq interprogram-cut-function 'x-select-text)
 (setq interprogram-paste-function 'x-selection-value)