Mercurial > emacs
changeset 110384:8d0ea2f29215
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Fri, 17 Sep 2010 14:07:47 +0900 |
| parents | e1094870ea06 (current diff) 987c8fd5107f (diff) |
| children | a5d5b9bb4ccf 8ceac426a2d7 |
| files | |
| diffstat | 5 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Sep 17 13:57:58 2010 +0900 +++ b/lisp/ChangeLog Fri Sep 17 14:07:47 2010 +0900 @@ -1,3 +1,18 @@ +2010-09-16 Chong Yidong <cyd@stupidchicken.com> + + * 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 <michael.albinus@gmx.de> + + * net/tramp-cmds.el (tramp-cleanup-connection): Set tramp-autoload + cookie. + 2010-09-15 Michael Albinus <michael.albinus@gmx.de> * 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):
--- a/lisp/ido.el Fri Sep 17 13:57:58 2010 +0900 +++ b/lisp/ido.el Fri Sep 17 14:07:47 2010 +0900 @@ -3403,6 +3403,8 @@ (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))
--- a/lisp/mail/sendmail.el Fri Sep 17 13:57:58 2010 +0900 +++ b/lisp/mail/sendmail.el Fri Sep 17 14:07:47 2010 +0900 @@ -1663,6 +1663,7 @@ ;; 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)
--- a/lisp/net/tramp-cmds.el Fri Sep 17 13:57:58 2010 +0900 +++ b/lisp/net/tramp-cmds.el Fri Sep 17 14:07:47 2010 +0900 @@ -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.
--- a/lisp/term/x-win.el Fri Sep 17 13:57:58 2010 +0900 +++ b/lisp/term/x-win.el Fri Sep 17 14:07:47 2010 +0900 @@ -1344,6 +1344,9 @@ (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)