diff options
| author | Jason Rumney | 2007-05-15 23:21:10 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-05-15 23:21:10 +0000 |
| commit | c60b74b403da560f1457dff79de4eff17c658e4b (patch) | |
| tree | 12981d7ec1a3305f8e291c5680beca58d03ce705 | |
| parent | 246a749bfcdf75437686826c84617c3d193e9364 (diff) | |
| download | emacs-c60b74b403da560f1457dff79de4eff17c658e4b.tar.gz emacs-c60b74b403da560f1457dff79de4eff17c658e4b.zip | |
Provide w32-win.
Don't throw error when global window-system not w32.
(x-cut-buffer-max): Remove.
(w32-initialize-window-system): New function.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add w32 entries.
| -rw-r--r-- | lisp/term/w32-win.el | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 56dbf944dfe..682de57d8a3 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el | |||
| @@ -68,8 +68,8 @@ | |||
| 68 | ;; An alist of X options and the function which handles them. See | 68 | ;; An alist of X options and the function which handles them. See |
| 69 | ;; ../startup.el. | 69 | ;; ../startup.el. |
| 70 | 70 | ||
| 71 | (if (not (eq window-system 'w32)) | 71 | ;; (if (not (eq window-system 'w32)) |
| 72 | (error "%s: Loading w32-win.el but not compiled for w32" (invocation-name))) | 72 | ;; (error "%s: Loading w32-win.el but not compiled for w32" (invocation-name))) |
| 73 | 73 | ||
| 74 | (require 'frame) | 74 | (require 'frame) |
| 75 | (require 'mouse) | 75 | (require 'mouse) |
| @@ -1075,8 +1075,8 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp") | |||
| 1075 | 1075 | ||
| 1076 | (setq frame-creation-function 'x-create-frame-with-faces) | 1076 | (setq frame-creation-function 'x-create-frame-with-faces) |
| 1077 | 1077 | ||
| 1078 | (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) | 1078 | ;; (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100) |
| 1079 | x-cut-buffer-max)) | 1079 | ;; x-cut-buffer-max)) |
| 1080 | 1080 | ||
| 1081 | ;; W32 expects the menu bar cut and paste commands to use the clipboard. | 1081 | ;; W32 expects the menu bar cut and paste commands to use the clipboard. |
| 1082 | ;; This has ,? to match both on Sunos and on Solaris. | 1082 | ;; This has ,? to match both on Sunos and on Solaris. |
| @@ -1246,5 +1246,16 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')." | |||
| 1246 | (tiff "libtiff3.dll" "libtiff.dll") | 1246 | (tiff "libtiff3.dll" "libtiff.dll") |
| 1247 | (gif "giflib4.dll" "libungif4.dll" "libungif.dll"))) | 1247 | (gif "giflib4.dll" "libungif4.dll" "libungif.dll"))) |
| 1248 | 1248 | ||
| 1249 | ;; multi-tty support | ||
| 1250 | (defun w32-initialize-window-system () | ||
| 1251 | "Initialize Emacs for W32 GUI frames." | ||
| 1252 | ) | ||
| 1253 | |||
| 1254 | (add-to-list 'handle-args-function-alist '(w32 . x-handle-args)) | ||
| 1255 | (add-to-list 'frame-creation-function-alist '(w32 . x-create-frame-with-faces)) | ||
| 1256 | (add-to-list 'window-system-initialization-alist '(w32 . w32-initialize-window-system)) | ||
| 1257 | |||
| 1258 | (provide 'w32-win) | ||
| 1259 | |||
| 1249 | ;; arch-tag: 69fb1701-28c2-4890-b351-3d1fe4b4f166 | 1260 | ;; arch-tag: 69fb1701-28c2-4890-b351-3d1fe4b4f166 |
| 1250 | ;;; w32-win.el ends here | 1261 | ;;; w32-win.el ends here |