diff options
| author | Glenn Morris | 2011-02-27 17:07:29 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-27 17:07:29 -0800 |
| commit | 2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch) | |
| tree | b924eb1c22ab3bce643676162ef039f250782661 /lisp/net | |
| parent | df7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff) | |
| parent | d1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff) | |
| download | emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip | |
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 57cc54935dc..b3278dc312d 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el | |||
| @@ -142,7 +142,7 @@ | |||
| 142 | (add-to-list 'tramp-methods (cons elt nil))))) | 142 | (add-to-list 'tramp-methods (cons elt nil))))) |
| 143 | 143 | ||
| 144 | (defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp") | 144 | (defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp") |
| 145 | "The preceeding object path for own objects.") | 145 | "The preceding object path for own objects.") |
| 146 | 146 | ||
| 147 | (defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon" | 147 | (defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon" |
| 148 | "The well known name of the GVFS daemon.") | 148 | "The well known name of the GVFS daemon.") |