(mouse-show-mark, mouse-save-then-kill): Don't use window-system.

2 files changed, 62 insertions, 55 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 081e140291e..57754105e4b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-28  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * mouse.el (mouse-show-mark, mouse-save-then-kill): Don't use
+        window-system.
+
+        * man.el (Man-notify-when-ready): Don't use window-system.  If
+        Man-notify-method is newframe, and the display is not
+        multi-frame, select the frame created for the man page.
+        (Man-init-defvars): Doc fix.
+
 2000-06-28  Gerd Moellmann  <gerd@gnu.org>
 
         * replace.el (query-replace-map): Bind `e' like `E'.
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 6896ff830c5..c67d22c158e 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -828,59 +828,57 @@ If DIR is positive skip forward; if negative, skip backward."
 
 (defun mouse-show-mark ()
   (if transient-mark-mode
-      (if window-system
-          (delete-overlay mouse-drag-overlay))
-    (if window-system
-        (let ((inhibit-quit t)
-              (echo-keystrokes 0)
-              event events key ignore
-              x-lost-selection-hooks)
-          (add-hook 'x-lost-selection-hooks
-                    (lambda (seltype)
-                       (if (eq seltype 'PRIMARY)
-                           (progn (setq ignore t)
-                                  (throw 'mouse-show-mark t)))))
-          (move-overlay mouse-drag-overlay (point) (mark t))
-          (catch 'mouse-show-mark
-            ;; In this loop, execute scroll bar and switch-frame events.
-            ;; Also ignore down-events that are undefined.
-            (while (progn (setq event (read-event))
-                          (setq events (append events (list event)))
-                          (setq key (apply 'vector events))
-                          (or (and (consp event)
-                                   (eq (car event) 'switch-frame))
-                              (and (consp event)
-                                   (eq (posn-point (event-end event))
-                                       'vertical-scroll-bar))
-                              (and (memq 'down (event-modifiers event))
-                                   (not (key-binding key))
-                                   (not (mouse-undouble-last-event events))
-                                   (not (member key mouse-region-delete-keys)))))
-              (and (consp event)
-                   (or (eq (car event) 'switch-frame)
-                       (eq (posn-point (event-end event))
-                           'vertical-scroll-bar))
-                   (let ((keys (vector 'vertical-scroll-bar event)))
-                     (and (key-binding keys)
-                          (progn
-                            (call-interactively (key-binding keys)
-                                                nil keys)
-                            (setq events nil)))))))
-          ;; If we lost the selection, just turn off the highlighting.
-          (if ignore
-              nil
-            ;; For certain special keys, delete the region.
-            (if (member key mouse-region-delete-keys)
-                (delete-region (overlay-start mouse-drag-overlay)
-                               (overlay-end mouse-drag-overlay))
-              ;; Otherwise, unread the key so it gets executed normally.
-              (setq unread-command-events
-                    (nconc events unread-command-events))))
-          (setq quit-flag nil)
-          (delete-overlay mouse-drag-overlay))
-      (save-excursion
-       (goto-char (mark t))
-       (sit-for 1)))))
+      (delete-overlay mouse-drag-overlay)
+    (let ((inhibit-quit t)
+          (echo-keystrokes 0)
+          event events key ignore
+          x-lost-selection-hooks)
+      (add-hook 'x-lost-selection-hooks
+                (lambda (seltype)
+                  (if (eq seltype 'PRIMARY)
+                      (progn (setq ignore t)
+                             (throw 'mouse-show-mark t)))))
+      (move-overlay mouse-drag-overlay (point) (mark t))
+      (catch 'mouse-show-mark
+        ;; In this loop, execute scroll bar and switch-frame events.
+        ;; Also ignore down-events that are undefined.
+        (while (progn (setq event (read-event))
+                      (setq events (append events (list event)))
+                      (setq key (apply 'vector events))
+                      (or (and (consp event)
+                               (eq (car event) 'switch-frame))
+                          (and (consp event)
+                               (eq (posn-point (event-end event))
+                                   'vertical-scroll-bar))
+                          (and (memq 'down (event-modifiers event))
+                               (not (key-binding key))
+                               (not (mouse-undouble-last-event events))
+                               (not (member key mouse-region-delete-keys)))))
+          (and (consp event)
+               (or (eq (car event) 'switch-frame)
+                   (eq (posn-point (event-end event))
+                       'vertical-scroll-bar))
+               (let ((keys (vector 'vertical-scroll-bar event)))
+                 (and (key-binding keys)
+                      (progn
+                        (call-interactively (key-binding keys)
+                                            nil keys)
+                        (setq events nil)))))))
+      ;; If we lost the selection, just turn off the highlighting.
+      (if ignore
+          nil
+        ;; For certain special keys, delete the region.
+        (if (member key mouse-region-delete-keys)
+            (delete-region (overlay-start mouse-drag-overlay)
+                           (overlay-end mouse-drag-overlay))
+          ;; Otherwise, unread the key so it gets executed normally.
+          (setq unread-command-events
+                (nconc events unread-command-events))))
+      (setq quit-flag nil)
+      (delete-overlay mouse-drag-overlay))
+    (save-excursion
+      (goto-char (mark t))
+      (sit-for 1))))
 
 (defun mouse-set-mark (click)
   "Set mark at the position clicked on with the mouse.
@@ -1068,8 +1066,7 @@ If you do this twice in the same position, the selection is killed."
                 (goto-char before-scroll))
             (exchange-point-and-mark)
             (kill-new (buffer-substring (point) (mark t)))
-            (if window-system
-                (mouse-show-mark)))
+            (mouse-show-mark))
           (mouse-set-region-1)
           (setq mouse-save-then-kill-posn
                 (list (car kill-ring) (point) click-posn)))))))