Use w32 instead of ms-windows for window-system symbol

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index bf6cad47f249fab727ab979b7b473cd4fcb50c4e..07d5f52c628b91a0d58513447cb3ef50b56776a1 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -491,7 +491,7 @@ This function queries the window-system server to find out what the
 color names mean.  It returns nil if the colors differ or if it can't
 determine the correct answer."
   (cond ((equal a b) t)
-       ((and (memq window-system '(x ms-windows))
+       ((and (memq window-system '(x w32))
              (equal (x-color-values a) (x-color-values b))))
        ((eq window-system 'pc)
         (and (x-color-defined-p a) (x-color-defined-p b)

diff --git a/lisp/faces.el b/lisp/faces.el
index 65011985dbb79d4e7cca601cdc6acc0c934ae4cb..41d85b43c0cc0f55afec9f4d7f485d25882ef984 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -409,7 +409,7 @@ If the face already exists, it is unmodified."
            (setq frames (cdr frames)))
          (setq global-face-data (cons (cons name face) global-face-data)))
        ;; when making a face after frames already exist
-       (if (memq window-system '(x ms-windows))
+       (if (memq window-system '(x w32))
            (make-face-x-resource-internal face))
        ;; add to menu
        (if (fboundp 'facemenu-add-new-face)
@@ -423,7 +423,7 @@ If the face already exists, it is unmodified."
   (cond ((null frame)
         (let ((frames (frame-list)))
           (while frames
-            (if (memq (framep (car frames)) '(x ms-windows))
+            (if (memq (framep (car frames)) '(x w32))
                 (make-face-x-resource-internal (face-name face)
                                                (car frames) set-anyway))
             (setq frames (cdr frames)))))
@@ -1303,7 +1303,7 @@ selected frame."
          (setq colors (cdr colors)))))))
 
 ;; If we are already using x-window frames, initialize faces for them.
-(if (memq (framep (selected-frame)) '(x ms-windows))
+(if (memq (framep (selected-frame)) '(x w32))
     (face-initialize))
 
 (provide 'faces)

diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index ddb896befdb8d3842510e902c141cdadcebab939..caa479d9ec84a49111c9fb01d2239267536902d9 100644 (file)
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -493,7 +493,7 @@ otherwise."
                  (string= (substring name-part 0 2) "[."))
             (concat (substring dir-part 0 -1) (substring name-part 1))
           (concat dir-part name-part)))
-       ((memq system-type '(ms-dos ms-windows))
+       ((memq system-type '(ms-dos w32))
         (if (and (string-match "\\\\" dir-part)
                  (not (string-match "/" dir-part))
                  (= (aref name-part (1- (length name-part))) ?/))

diff --git a/lisp/info.el b/lisp/info.el
index 5ec81da6ca88a4f9a44c42f026f7387631bb577a..9e001469073d062bfd4136486ec6485425d2bd3e 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1719,7 +1719,7 @@ Advanced commands:
   (make-local-variable 'Info-tag-table-marker)
   (make-local-variable 'Info-history)
   (make-local-variable 'Info-index-alternatives)
-  (if (memq (framep (selected-frame)) '(x pc ms-windows))
+  (if (memq (framep (selected-frame)) '(x pc w32))
       (progn
        (make-face 'info-node)
        (make-face 'info-menu-5)

diff --git a/lisp/mouse.el b/lisp/mouse.el
index de0735529f79ecf4c461e76aad865b69b9fceac3..0981533d038c28c78439b2640b208dda496e4e26 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -401,7 +401,7 @@ This should be bound to a mouse drag event."
     ;; If mark is highlighted, no need to bounce the cursor.
     ;; On X, we highlight while dragging, thus once again no need to bounce.
     (or transient-mark-mode
-       (memq (framep (selected-frame)) '(x pc ms-windows))
+       (memq (framep (selected-frame)) '(x pc w32))
        (sit-for 1))
     (push-mark)
     (set-mark (point))

diff --git a/lisp/vc.el b/lisp/vc.el
index 1ed84971b0dccdb022619b0a874d260f06381d2a..7c7cdced2ea3631afdc984478d3464921c28dc66 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -424,7 +424,7 @@ to an optional list of FLAGS."
                         path-separator
                         (mapconcat 'identity vc-path path-separator))
                 process-environment))
-         (win32-quote-process-args t))
+         (w32-quote-process-args t))
       (setq status (apply 'call-process command nil t nil squeezed)))
     (goto-char (point-max))
     (set-buffer-modified-p nil)