diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-23 01:37:59 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-23 01:37:59 +0200 |
| commit | df508ffd2bedf901996d8899c63183aaf327f887 (patch) | |
| tree | 0d1ebe7b35b43957f5de6ffa95c5b0794df69dc5 /lisp/net/tramp-gvfs.el | |
| parent | f268cdc185b5e98456434da0cfda963b614227fd (diff) | |
| parent | ae1ace1cf4a8b0624f72a8f76e702d78b643ea32 (diff) | |
| download | emacs-df508ffd2bedf901996d8899c63183aaf327f887.tar.gz | |
Merge from origin/emacs-28
ae1ace1cf4 Adjust help-fns.el tests for recent change
04bdcf4aaa * src/terminal.c (Fframe_terminal): Use active voice
7fa491a9e9 Improve 'terminal-live-p' docstring some more
b9ac8c29ae Improve terminal-live-p docstring
0b4c81a152 * lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-event-vector): F...
8f8373170f * lisp/progmodes/cperl-mode.el: Don't mention obsolete arc...
25bc330a6d Make 'describe-function' say "byte-compiled" when appropriate
2b31e667be ;Improve documentation of locale-specific string comparison
Diffstat (limited to 'lisp/net/tramp-gvfs.el')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 056237fd55c..03a6a46e80d 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -87,7 +87,7 @@ ;; For hostname completion, information is retrieved from the zeroconf ;; daemon (for the "afp", "dav", "davs", and "sftp" methods). The ;; zeroconf daemon is pre-configured to discover services in the -;; "local" domain. If another domain shall be used for discovering +;; "local" domain. If another domain should be used for discovering ;; services, the user option `tramp-gvfs-zeroconf-domain' can be set ;; accordingly. @@ -943,7 +943,7 @@ The call will be traced by Tramp with trace level 6." "Current Tramp file name to be used, as vector. It is needed when D-Bus signals or errors arrive, because there is no information where to trace the message. -Globally, the value shall always be nil; it is bound where needed.") +The global value will always be nil; it is bound where needed.") (defun tramp-gvfs-dbus-event-error (event err) "Called when a D-Bus error message arrives, see `dbus-event-error-functions'." |