aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2007-08-08 05:51:36 +0000
committerMartin Rudalics2007-08-08 05:51:36 +0000
commit70ad3da9ecdb3f7b149f78d436913f7352101093 (patch)
treea2f47f52711209786742c1ad07d7a5320095e425
parent1be8283dbad6cb41670cb45a2e74008ed409240b (diff)
downloademacs-70ad3da9ecdb3f7b149f78d436913f7352101093.tar.gz
emacs-70ad3da9ecdb3f7b149f78d436913f7352101093.zip
Use window-full-width-p instead of comparing frame-width and
window-width.
-rw-r--r--lisp/calendar/calendar.el2
-rw-r--r--lisp/dired.el4
-rw-r--r--lisp/mouse-drag.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index 719f32be3c1..330cf8521f3 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -2078,7 +2078,7 @@ Or, for optional MON, YR."
2078 ;; Don't do any window-related stuff if we weren't called from a 2078 ;; Don't do any window-related stuff if we weren't called from a
2079 ;; window displaying the calendar 2079 ;; window displaying the calendar
2080 (when in-calendar-window 2080 (when in-calendar-window
2081 (if (or (one-window-p t) (/= (frame-width) (window-width))) 2081 (if (or (one-window-p t) (not (window-full-width-p)))
2082 ;; Don't mess with the window size, but ensure that the first 2082 ;; Don't mess with the window size, but ensure that the first
2083 ;; line is fully visible 2083 ;; line is fully visible
2084 (set-window-vscroll nil 0) 2084 (set-window-vscroll nil 0)
diff --git a/lisp/dired.el b/lisp/dired.el
index 3639f44b553..bd160df7bda 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2547,12 +2547,12 @@ deletion of non-empty directories is allowed."
2547 (cond ;; if split-height-threshold is enabled, use the largest window 2547 (cond ;; if split-height-threshold is enabled, use the largest window
2548 ((and (> (window-height (setq w2 (get-largest-window))) 2548 ((and (> (window-height (setq w2 (get-largest-window)))
2549 split-height-threshold) 2549 split-height-threshold)
2550 (= (frame-width) (window-width w2))) 2550 (window-full-width-p w2))
2551 (setq window w2)) 2551 (setq window w2))
2552 ;; if the least-recently-used window is big enough, use it 2552 ;; if the least-recently-used window is big enough, use it
2553 ((and (> (window-height (setq w2 (get-lru-window))) 2553 ((and (> (window-height (setq w2 (get-lru-window)))
2554 (* 2 window-min-height)) 2554 (* 2 window-min-height))
2555 (= (frame-width) (window-width w2))) 2555 (window-full-width-p w2))
2556 (setq window w2))) 2556 (setq window w2)))
2557 (save-excursion 2557 (save-excursion
2558 (set-buffer buf) 2558 (set-buffer buf)
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index f1d56eccc66..bfb199ab897 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -158,7 +158,7 @@ Keep the cursor on the screen as needed."
158Basically, we check for existing horizontal scrolling." 158Basically, we check for existing horizontal scrolling."
159 (or truncate-lines 159 (or truncate-lines
160 (> (window-hscroll (selected-window)) 0) 160 (> (window-hscroll (selected-window)) 0)
161 (< (window-width) (frame-width)) 161 (not (window-full-width-p))
162 (and 162 (and
163 mouse-drag-electric-col-scrolling 163 mouse-drag-electric-col-scrolling
164 (save-excursion ;; on a long line? 164 (save-excursion ;; on a long line?