Merge remote-tracking branch 'origin/master' into feature/android

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

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)

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"))