diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-05-15 09:10:49 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-05-15 09:10:49 +0800 |
| commit | 45ab9158cf1a94041ad65c66818dde56e7c1c43b (patch) | |
| tree | 3f1444012cfe35682320c36985aacf2e6ddf3e72 | |
| parent | 841b0e220111869fcaf26468d88c7dd18e3caac1 (diff) | |
| parent | e7dc30c1d58c602ccc4b7b9c98c0ea07f5631675 (diff) | |
| download | emacs-45ab9158cf1a94041ad65c66818dde56e7c1c43b.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/android
| -rw-r--r-- | lisp/net/net-utils.el | 10 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 3 | ||||
| -rw-r--r-- | lisp/w32-fns.el | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el index ea4318e21b5..cb725c0674e 100644 --- a/lisp/net/net-utils.el +++ b/lisp/net/net-utils.el @@ -774,11 +774,11 @@ and `network-connection-service-alist', which see." (process-name (concat "Finger [" user-and-host "]")) (regexps finger-X.500-host-regexps) ) ;; found - (and regexps - (while (not (string-match (car regexps) host)) - (setq regexps (cdr regexps))) - (when regexps - (setq user-and-host user))) + (when regexps + (while (not (string-match (car regexps) host)) + (setq regexps (cdr regexps))) + (when regexps + (setq user-and-host user))) (run-network-program process-name host diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index e3b42acfed5..e214d610c91 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -2537,7 +2537,8 @@ This uses \"avahi-browse\" in case D-Bus is not enabled in Avahi." (let ((tramp-verbose 0) tramp-gvfs-dbus-event-vector fun) (when (and (autoload 'zeroconf-init "zeroconf") - (tramp-compat-funcall 'dbus-get-unique-name :system)) + (ignore-error dbus-error + (tramp-compat-funcall 'dbus-get-unique-name :system))) ;; Add completion functions for services announced by DNS-SD. ;; See <http://www.dns-sd.org/ServiceTypes.html> for valid service types. (zeroconf-init tramp-gvfs-zeroconf-domain) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index bb19706129e..d9b91cfb6ea 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -331,7 +331,7 @@ names." (vminor (w32-read-registry 'HKLM key "CurrentMinorVersionNumber"))) - (if (and vmajor vmajor) + (if (and vmajor vminor) (format "%d.%d" vmajor vminor) (w32-read-registry 'HKLM key "CurrentVersion"))))) (os-csd (w32-read-registry 'HKLM key "CSDVersion")) |