diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-18 14:05:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-18 14:05:31 -0700 |
| commit | 0808f2a1a331fbcb2e6ab57894502b0a34311869 (patch) | |
| tree | 72386004f3d60a5fdbaf1176edeb38ba4083677e /lisp/window.el | |
| parent | 3aa73b04e81ebc396892b14e5e9fa78a13ff85d1 (diff) | |
| parent | ac00a92e3df7111c0eb2c6456ae7df5850bfd8fa (diff) | |
| download | emacs-0808f2a1a331fbcb2e6ab57894502b0a34311869.tar.gz | |
Merge from origin/emacs-25
ac00a92 Make sh-electric-here-document-mode accessible in sh-mode-hoo...
3287f48 ; Add entry to MAINTAINERS
b85981f * configure.ac (HAVE_MODULES): Exclude gnu-kfreebsd from prev...
0f33284 Make use of rectangle-preview custom variable.
aa0d83a Make use of rectangle-preview face.
33bef6e Use 'grep-find-program' in check-declare.el
a8560e5 Improve "C-h S" for cl-lib symbols
52e798b Fix minor issues with removing left or right fringes
d6ffd64 Speed up redisplay in ansi-term mode
4ab671c Simplify 8-bit character handling by terminal for 'raw-text'
f3653ec * configure.ac (HAVE_MODULES): Treat gnu like gnu-linux. (Bu...
ab849b7 Fix w32 memory-management problem when extending buffer text
Diffstat (limited to 'lisp/window.el')
| -rw-r--r-- | lisp/window.el | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el index 1d41d821dc4..e086efb594d 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -1889,9 +1889,19 @@ the font." (ncols (/ window-width font-width))) (if (and (display-graphic-p) overflow-newline-into-fringe - (/= (frame-parameter nil 'left-fringe) 0) - (/= (frame-parameter nil 'right-fringe) 0)) + (not + (or (eq left-fringe-width 0) + (and (null left-fringe-width) + (= (frame-parameter nil 'left-fringe) 0)))) + (not + (or (eq right-fringe-width 0) + (and (null right-fringe-width) + (= (frame-parameter nil 'right-fringe) 0))))) ncols + ;; FIXME: This should remove 1 more column when there are no + ;; fringes, lines are truncated, and the window is hscrolled, + ;; but EOL is not in the view, because then there are 2 + ;; truncation glyphs, not one. (1- ncols))))) (defun window-current-scroll-bars (&optional window) |