Commit b86b9918 authored by Geoff Voelker's avatar Geoff Voelker

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

parent 60c7469c
......@@ -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)
......@@ -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))
(provide 'faces)
......@@ -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))) ?/))
......@@ -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))
(make-face 'info-node)
(make-face 'info-menu-5)
......@@ -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))
(set-mark (point))
......@@ -424,7 +424,7 @@ to an optional list of FLAGS."
(mapconcat 'identity vc-path path-separator))
(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)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment