From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 2 Aug 2022 17:27:46 +0000 (+0300)
Subject: ; Fix system-info in url-privacy.el
X-Git-Tag: emacs-29.0.90~1447^2~533
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=286e308561d00a31e0321919ef36d9bc6dadbeb3;p=emacs.git

; Fix system-info in url-privacy.el

* lisp/url/url-privacy.el (url-setup-privacy-info): Fix MS-Windows
configurations.
---

diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index 93a512c02ed..36ccbe2adc1 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -41,9 +41,16 @@
 	  nil)
 	 ;; First, we handle the inseparable OS/Windowing system
 	 ;; combinations
-	 ((eq system-type 'windows-nt) "Windows-NT; 32bit")
+	 ((memq system-type '(windows-nt cygwin))
+          (concat "MS-Windows; "
+                  (if (string-match-p "\\`x86_64" system-configuration)
+                      "64bit"
+                    "32bit")
+                  "; "
+                  (cond ((eq window-system 'w32) "w32")
+                        ((eq window-system 'x) "X11")
+                        (t "TTY"))))
 	 ((eq system-type 'ms-dos) "MS-DOS; 32bit")
-         ((memq window-system '(win32 w32)) "Windows; 32bit")
 	 (t
 	  (pcase (or window-system 'tty)
 	    ('x "X11")