[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/net tramp.el
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs/lisp/net tramp.el |
Date: |
Tue, 04 Aug 2009 03:31:51 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Michael Albinus <albinus> 09/08/04 03:31:51
Modified files:
lisp/net : tramp.el
Log message:
* net/tramp.el (top): Make check for tramp-gvfs loading more
robust.
(tramp-handle-insert-file-contents): `unwind-protect' must be
inside `with-parsed-tramp-file-name'.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/net/tramp.el?cvsroot=emacs&r1=1.247&r2=1.248
Patches:
Index: tramp.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/tramp.el,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- tramp.el 3 Aug 2009 08:21:29 -0000 1.247
+++ tramp.el 4 Aug 2009 03:31:51 -0000 1.248
@@ -143,6 +143,9 @@
;; tramp-gvfs needs D-Bus messages. Available since Emacs 23
;; on some system types.
(when (and (featurep 'dbusbind)
+ (condition-case nil
+ (funcall 'dbus-get-unique-name :session)
+ (error nil))
(tramp-compat-process-running-p "gvfs-fuse-daemon"))
'tramp-gvfs)
@@ -4213,9 +4216,8 @@
(barf-if-buffer-read-only)
(setq filename (expand-file-name filename))
(let (coding-system-used result local-copy remote-copy)
- (unwind-protect
(with-parsed-tramp-file-name filename nil
-
+ (unwind-protect
(if (not (file-exists-p filename))
;; We don't raise a Tramp error, because it might be
;; suppressed, like in `find-file-noselect-1'.
@@ -4286,7 +4288,7 @@
(tramp-message
v 4 "Inserting local temp file `%s'...done" local-copy)
(when (boundp 'last-coding-system-used)
- (set 'last-coding-system-used coding-system-used)))))
+ (set 'last-coding-system-used coding-system-used))))
;; Save exit.
(progn
@@ -4299,7 +4301,7 @@
(delete-file local-copy))
(when (stringp remote-copy)
(delete-file
- (tramp-make-tramp-file-name method user host remote-copy)))))
+ (tramp-make-tramp-file-name method user host remote-copy))))))
;; Result.
(list (expand-file-name filename)
@@ -4919,7 +4921,7 @@
(cons jka (delete jka file-name-handler-alist))))))
;; During autoload, it shall be checked whether
-;; `partial-completion-mode' is active. Therefore registering of
+;; `partial-completion-mode' is active. Therefore, registering of
;; `tramp-completion-file-name-handler' will be delayed.
;;;###autoload(add-hook
;;;###autoload 'after-init-hook
- [Emacs-diffs] emacs/lisp/net tramp.el, Michael Albinus, 2009/08/02
- [Emacs-diffs] emacs/lisp/net tramp.el, Michael Albinus, 2009/08/03
- [Emacs-diffs] emacs/lisp/net tramp.el,
Michael Albinus <=
- [Emacs-diffs] emacs/lisp/net tramp.el, Michael Albinus, 2009/08/09
- [Emacs-diffs] emacs/lisp/net tramp.el, Michael Albinus, 2009/08/17
- [Emacs-diffs] emacs/lisp/net tramp.el, Michael Albinus, 2009/08/27
- [Emacs-diffs] emacs/lisp/net tramp.el, Michael Albinus, 2009/08/28