Mercurial > emacs
changeset 16590:a0cfcb9f8033
Use w32 instead of ms-windows for window-system symbol
| author | Geoff Voelker <voelker@cs.washington.edu> |
|---|---|
| date | Tue, 19 Nov 1996 06:59:17 +0000 |
| parents | ec300a10e407 |
| children | afb15f49a0c9 |
| files | lisp/facemenu.el lisp/faces.el lisp/hippie-exp.el lisp/info.el lisp/mouse.el lisp/vc.el |
| diffstat | 6 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/facemenu.el Tue Nov 19 06:49:05 1996 +0000 +++ b/lisp/facemenu.el Tue Nov 19 06:59:17 1996 +0000 @@ -491,7 +491,7 @@ 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)
--- a/lisp/faces.el Tue Nov 19 06:49:05 1996 +0000 +++ b/lisp/faces.el Tue Nov 19 06:59:17 1996 +0000 @@ -409,7 +409,7 @@ (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 @@ (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 @@ (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)
--- a/lisp/hippie-exp.el Tue Nov 19 06:49:05 1996 +0000 +++ b/lisp/hippie-exp.el Tue Nov 19 06:59:17 1996 +0000 @@ -493,7 +493,7 @@ (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))) ?/))
--- a/lisp/info.el Tue Nov 19 06:49:05 1996 +0000 +++ b/lisp/info.el Tue Nov 19 06:59:17 1996 +0000 @@ -1719,7 +1719,7 @@ (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)
--- a/lisp/mouse.el Tue Nov 19 06:49:05 1996 +0000 +++ b/lisp/mouse.el Tue Nov 19 06:59:17 1996 +0000 @@ -401,7 +401,7 @@ ;; 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))
--- a/lisp/vc.el Tue Nov 19 06:49:05 1996 +0000 +++ b/lisp/vc.el Tue Nov 19 06:59:17 1996 +0000 @@ -424,7 +424,7 @@ 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)