(msdos-face-setup): Register standard colors in

[bpt/emacs.git] / lisp / mldrag.el

diff --git a/lisp/mldrag.el b/lisp/mldrag.el
index 1ac9a89..6e1d3d7 100644 (file)
--- a/lisp/mldrag.el
+++ b/lisp/mldrag.el
@@ -1,5 +1,6 @@
 ;;; mldrag.el --- mode line and vertical line dragging to resize windows
-;;; Copyright (C) 1994 Free Software Foundation, Inc.
+
+;; Copyright (C) 1994 Free Software Foundation, Inc.
 
 ;; Author: Kyle E. Jones <kyle@wonderworks.com>
 ;; Keywords: mouse
@@ -17,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -151,18 +153,23 @@ usefully bound with the `vertical-line' or the `vertical-scroll-bar'
 prefix.  Holding down a mouse button and moving the mouse left and
 right will make the clicked-on window thinner or wider."
   (interactive "e")
-  (let ((done nil)
-       (echo-keystrokes 0)
-       (start-event-frame (window-frame (car (car (cdr start-event)))))
-       (start-event-window (car (car (cdr start-event))))
-       (start-nwindows (count-windows t))
-       (old-selected-window (selected-window))
-       event mouse x left right edges wconfig growth)
+  (let* ((done nil)
+        (echo-keystrokes 0)
+        (start-event-frame (window-frame (car (car (cdr start-event)))))
+        (scroll-bar-left
+         (eq (cdr (assq 'vertical-scroll-bars (frame-parameters))) 'left))
+        (start-event-window (car (car (cdr start-event))))
+        (start-nwindows (count-windows t))
+        (old-selected-window (selected-window))
+        event mouse x left right edges wconfig growth)
     (if (one-window-p t)
        (error "Attempt to resize sole ordinary window"))
-    (if (= (nth 2 (window-edges start-event-window))
-          (frame-width start-event-frame))
-       (error "Attempt to drag rightmost scrollbar"))
+    (if scroll-bar-left
+       (when (= (nth 0 (window-edges start-event-window)) 0)
+         (error "Attempt to drag leftmost scrollbar"))
+      (when (>= (nth 2 (window-edges start-event-window))
+               (frame-width start-event-frame))
+       (error "Attempt to drag rightmost scrollbar")))
     (unwind-protect
        (track-mouse
          (progn
@@ -204,10 +211,15 @@ right will make the clicked-on window thinner or wider."
                           right (nth 2 edges))
                     ;; scale back a move that would make the
                     ;; window too thin.
-                    (cond ((< (- x left -1) window-min-width)
-                           (setq x (+ left window-min-width -1))))
+                    (if scroll-bar-left
+                        (cond ((< (- right x) window-min-width)
+                             (setq x (- right window-min-width))))
+                      (cond ((< (- x left -1) window-min-width)
+                             (setq x (+ left window-min-width -1)))))
                     ;; compute size change needed
-                    (setq growth (- x right -1)
+                    (setq growth (if scroll-bar-left
+                                     (- left x)
+                                   (- x right -1))
                           wconfig (current-window-configuration))
                     (enlarge-window growth t)
                     ;; if this window's growth caused another
@@ -218,7 +230,9 @@ right will make the clicked-on window thinner or wider."
                     ;; from a window to the left of this one,
                     ;; rescind the change.
                     (if (or (/= start-nwindows (count-windows t))
-                            (/= left (nth 0 (window-edges))))
+                            (if scroll-bar-left
+                                (/= right (nth 2 (window-edges)))
+                              (/= left (nth 0 (window-edges)))))
                         (set-window-configuration wconfig)))))))
       ;; restore the old selected window
       (select-window old-selected-window))))