Mercurial > emacs
comparison lisp/net/tramp.el @ 108269:96984953f99e
* net/tramp.el (top, with-progress-reporter): Use
`symbol-function' inside `funcall'.
* net/tramp-compat.el (tramp-compat-file-attributes)
(tramp-compat-delete-file, tramp-compat-delete-directory): Handle
only `wrong-number-of-arguments' error.
* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Fix typo.
(tramp-gvfs-handle-file-selinux-context): Use `symbol-function'
inside `funcall'.
| author | Michael Albinus <michael.albinus@gmx.de> |
|---|---|
| date | Thu, 06 May 2010 10:40:06 +0200 |
| parents | 2ee48fcc701c |
| children | 7827d5a5c826 |
comparison
equal
deleted
inserted
replaced
| 108268:43dc83feb3b6 | 108269:96984953f99e |
|---|---|
| 143 ;; tramp-gvfs needs D-Bus messages. Available since Emacs 23 | 143 ;; tramp-gvfs needs D-Bus messages. Available since Emacs 23 |
| 144 ;; on some system types. We don't call `dbus-ping', because | 144 ;; on some system types. We don't call `dbus-ping', because |
| 145 ;; this would load dbus.el. | 145 ;; this would load dbus.el. |
| 146 (when (and (featurep 'dbusbind) | 146 (when (and (featurep 'dbusbind) |
| 147 (condition-case nil | 147 (condition-case nil |
| 148 (funcall 'dbus-get-unique-name :session) | 148 (funcall (symbol-function 'dbus-get-unique-name) |
| 149 :session) | |
| 149 (error nil)) | 150 (error nil)) |
| 150 (tramp-compat-process-running-p "gvfs-fuse-daemon")) | 151 (tramp-compat-process-running-p "gvfs-fuse-daemon")) |
| 151 'tramp-gvfs) | 152 'tramp-gvfs) |
| 152 | 153 |
| 153 ;; Load gateways. It needs `make-network-process' from Emacs 22. | 154 ;; Load gateways. It needs `make-network-process' from Emacs 22. |
| 2271 (tramp-message ,vec ,level "%s..." ,message) | 2272 (tramp-message ,vec ,level "%s..." ,message) |
| 2272 ;; We start a pulsing progress reporter after 3 seconds. Feature | 2273 ;; We start a pulsing progress reporter after 3 seconds. Feature |
| 2273 ;; introduced in Emacs 24.1. | 2274 ;; introduced in Emacs 24.1. |
| 2274 (when (<= ,level tramp-verbose) | 2275 (when (<= ,level tramp-verbose) |
| 2275 (condition-case nil | 2276 (condition-case nil |
| 2276 (setq pr (funcall 'make-progress-reporter ,message) | 2277 (setq pr (funcall (symbol-function 'make-progress-reporter) ,message) |
| 2277 tm (run-at-time 3 0.1 'progress-reporter-update pr)) | 2278 tm (run-at-time 3 0.1 'progress-reporter-update pr)) |
| 2278 (error nil))) | 2279 (error nil))) |
| 2279 (unwind-protect | 2280 (unwind-protect |
| 2280 ;; Execute the body. | 2281 ;; Execute the body. |
| 2281 (progn ,@body) | 2282 (progn ,@body) |