diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/dos-fns.el | 19 | ||||
| -rw-r--r-- | lisp/faces.el | 2 | ||||
| -rw-r--r-- | lisp/info.el | 2 | ||||
| -rw-r--r-- | lisp/loadup.el | 13 | ||||
| -rw-r--r-- | lisp/mouse.el | 2 |
5 files changed, 23 insertions, 15 deletions
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index 213ce288fd9..39cbbf2f129 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -141,11 +141,14 @@ against the file name, and TYPE is nil for text, t for binary.") (defsubst intdos (regs) (int86 33 regs)) -;;; Fix interface to (X-specific) mouse.el -(defalias 'window-frame 'ignore) -(defalias 'x-set-selection 'ignore) -(fset 'x-get-selection '(lambda (&rest rest) "")) -(fmakunbound 'font-menu-add-default) -(global-unset-key [C-down-mouse-1]) -(global-unset-key [C-down-mouse-2]) -(global-unset-key [C-down-mouse-3]) +;; Extra stub to functions in src/frame.c +;; Emacs aborts during dump if the following don't have a doc string. +(defun window-frame (window) + "Return the frame that WINDOW resides on." + (selected-frame)) +(defun raise-frame (frame) + "Raise FRAME to the top of the desktop." + nil) +(defun select-frame (frame &optional no-enter) + "Select FRAME for input events." + (selected-frame)) diff --git a/lisp/faces.el b/lisp/faces.el index 335e583f13a..56fce6ffc70 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -842,7 +842,7 @@ selected frame." (let ((frames (frame-list))) (while frames - (if (eq (framep (car frames)) 'x) + (if (framep (car frames)) (let ((frame (car frames)) (rest global-face-data)) (while rest diff --git a/lisp/info.el b/lisp/info.el index 8c78aa1d6e1..c4bc2c0a4ff 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1495,7 +1495,7 @@ Advanced commands: (make-local-variable 'Info-tag-table-marker) (make-local-variable 'Info-history) (make-local-variable 'Info-index-alternatives) - (if (eq (framep (selected-frame)) 'x) + (if (memq (framep (selected-frame)) '(x pc)) (progn (make-face 'info-node) (make-face 'info-menu-5) diff --git a/lisp/loadup.el b/lisp/loadup.el index 7b8f8922059..f9f0bd50093 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -100,12 +100,16 @@ (progn (load "ls-lisp") (garbage-collect) - (load "mouse") - (garbage-collect) (load "dos-fns") (garbage-collect) (load "disp-table") ; needed to setup ibm-pc char set, see internal.el - (garbage-collect))) + (garbage-collect) + (if (not (fboundp 'delete-frame)) + (progn + (load "mouse") + (garbage-collect) + (load "faces") + (garbage-collect))))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if (garbage-collect) ; we have float support. @@ -156,7 +160,8 @@ "-" (substring name (match-end 0))))) (if (eq system-type 'ms-dos) - (setq name (expand-file-name "../etc/DOC")) + (setq name (expand-file-name + (if (fboundp 'make-frame) "DOC-X" "DOC") "../etc")) (setq name (concat (expand-file-name "../etc/DOC-") name)) (if (file-exists-p name) (delete-file name)) diff --git a/lisp/mouse.el b/lisp/mouse.el index 689707f2cc1..ea572c21663 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -300,7 +300,7 @@ This should be bound to a mouse drag event." (goto-char (posn-point posn))) ;; If mark is highlighted, no need to bounce the cursor. (or (and transient-mark-mode - (eq (framep (selected-frame)) 'x)) + (framep (selected-frame))) (sit-for 1)) (push-mark) (set-mark (point)) |