diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 16 | ||||
| -rw-r--r-- | lisp/loadup.el | 6 | ||||
| -rw-r--r-- | lisp/mouse.el | 18 |
3 files changed, 25 insertions, 15 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 2a598778245..36d4898f35b 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -115,10 +115,14 @@ These supercede the values given in default-frame-alist.") (defun frame-notice-user-settings () (if frame-initial-frame (progn - ;; If the user wants a minibuffer-only frame, we'll have to ;; make a new one; you can't remove or add a root window to/from ;; an existing frame. + ;; NOTE: default-frame-alist was nil when we created the + ;; existing frame. We need to explicitly include + ;; default-frame-alist in the parameters of the screen we + ;; create here, so that its new value, gleaned from the user's + ;; .emacs file, will be applied to the existing screen. (if (eq (cdr (or (assq 'minibuffer initial-frame-alist) '(minibuffer . t))) 'only) @@ -126,10 +130,18 @@ These supercede the values given in default-frame-alist.") (setq default-minibuffer-frame (new-frame (append initial-frame-alist + default-frame-alist (frame-parameters frame-initial-frame)))) + + ;; Redirect events enqueued at this frame to the new frame. + ;; Is this a good idea? + (redirect-frame-focus frame-initial-frame + default-minibuffer-frame) + (delete-frame frame-initial-frame)) (modify-frame-parameters frame-initial-frame - initial-frame-alist)))) + (append initial-frame-alist + default-frame-alist))))) ;; Make sure the initial frame can be GC'd if it is ever deleted. (makunbound 'frame-initial-frame)) diff --git a/lisp/loadup.el b/lisp/loadup.el index f9959966861..f13f6c7cc1e 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -119,11 +119,9 @@ (setq name (concat (expand-file-name "../etc/DOC-") name)) (if (file-exists-p name) (delete-file name)) - (copy-file (expand-file-name "../etc/DOC") - name - t) + (copy-file (expand-file-name "../etc/DOC") name t) (Snarf-documentation (file-name-nondirectory name))) - (Snarf-documentation "DOC")) + (Snarf-documentation "DOC")) (message "Finding pointers to doc strings...done") ;Note: You can cause additional libraries to be preloaded diff --git a/lisp/mouse.el b/lisp/mouse.el index bc3f8c1744d..1297325186e 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -40,13 +40,13 @@ (defun mouse-delete-window (click) "Delete the window clicked on. This must be bound to a mouse click." - (interactive "K") + (interactive "e") (delete-window (event-window click))) (defun mouse-delete-other-windows (click) "Select Emacs window clicked on, then kill all other Emacs windows. This must be bound to a mouse click." - (interactive "K") + (interactive "e") (select-window (event-window click)) (delete-other-windows)) @@ -54,14 +54,14 @@ This must be bound to a mouse click." "Select Emacs window mouse is on, then split it vertically in half. The window is split at the line clicked on. This command must be bound to a mouse click." - (interactive "K") + (interactive "e") (select-window (event-window click)) (split-window-vertically (1+ (cdr (mouse-coords click))))) (defun mouse-set-point (click) "Move point to the position clicked on with the mouse. This must be bound to a mouse click." - (interactive "K") + (interactive "e") (select-window (event-window click)) (if (numberp (event-point click)) (goto-char (event-point click)))) @@ -70,7 +70,7 @@ This must be bound to a mouse click." "Set mark at the position clicked on with the mouse. Display cursor at that position for a second. This must be bound to a mouse click." - (interactive "K") + (interactive "e") (let ((point-save (point))) (unwind-protect (progn (mouse-set-point click) @@ -81,7 +81,7 @@ This must be bound to a mouse click." (defun mouse-kill (click) "Kill the region between point and the mouse click. The text is saved in the kill ring, as with \\[kill-region]." - (interactive "K") + (interactive "e") (let ((click-posn (event-point click))) (if (numberp click-posn) (kill-region (min (point) click-posn) @@ -90,20 +90,20 @@ The text is saved in the kill ring, as with \\[kill-region]." (defun mouse-yank-at-click (click arg) "Insert the last stretch of killed text at the position clicked on. Prefix arguments are interpreted as with \\[yank]." - (interactive "K\nP") + (interactive "e\nP") (mouse-set-point click) (yank arg)) (defun mouse-kill-ring-save (click) "Copy the region between point and the mouse click in the kill ring. This does not delete the region; it acts like \\[kill-ring-save]." - (interactive "K") + (interactive "e") (mouse-set-mark click) (call-interactively 'kill-ring-save)) (defun mouse-buffer-menu (event) "Pop up a menu of buffers for selection with the mouse." - (interactive "K") + (interactive "e") (let ((menu (list "Buffer Menu" (cons "Select Buffer" |