diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/calendar/calendar.el | 2 | ||||
| -rw-r--r-- | lisp/dired.el | 4 | ||||
| -rw-r--r-- | lisp/mouse-drag.el | 2 |
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." ;; Don't do any window-related stuff if we weren't called from a ;; window displaying the calendar (when in-calendar-window - (if (or (one-window-p t) (/= (frame-width) (window-width))) + (if (or (one-window-p t) (not (window-full-width-p))) ;; Don't mess with the window size, but ensure that the first ;; line is fully visible (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." (cond ;; if split-height-threshold is enabled, use the largest window ((and (> (window-height (setq w2 (get-largest-window))) split-height-threshold) - (= (frame-width) (window-width w2))) + (window-full-width-p w2)) (setq window w2)) ;; if the least-recently-used window is big enough, use it ((and (> (window-height (setq w2 (get-lru-window))) (* 2 window-min-height)) - (= (frame-width) (window-width w2))) + (window-full-width-p w2)) (setq window w2))) (save-excursion (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." Basically, we check for existing horizontal scrolling." (or truncate-lines (> (window-hscroll (selected-window)) 0) - (< (window-width) (frame-width)) + (not (window-full-width-p)) (and mouse-drag-electric-col-scrolling (save-excursion ;; on a long line? |