From: Martin Rudalics <rudalics@gmx.at>
Date: Mon, 6 Oct 2014 06:45:10 +0000 (+0200)
Subject: In term-window-width subtract 1 from width when any fringe has zero width. (Bug#18601)
X-Git-Tag: emacs-24.4-rc1~35
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e76955cbb521aee4af70a8c93d9f1be5f1d3f4a6;p=emacs.git

In term-window-width subtract 1 from width when any fringe has zero width. (Bug#18601)

* term.el (term-window-width): Subtract 1 from the width when
any fringe has zero width, not just the right fringe.  (Bug#18601)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5eda032f74..5045e5d1469 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-06  Martin Rudalics  <rudalics@gmx.at>
+
+	* term.el (term-window-width): Subtract 1 from the width when
+	any fringe has zero width, not just the right fringe.  (Bug#18601)
+
 2014-10-05  Leo Liu  <sdl.web@gmail.com>
 
 	* imenu.el (imenu-default-goto-function): Fix typo.
diff --git a/lisp/term.el b/lisp/term.el
index ce6125e2790..f361b983e48 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -974,6 +974,9 @@ is buffer-local."
   (if (and (not (featurep 'xemacs))
 	   (display-graphic-p)
 	   overflow-newline-into-fringe
+	   ;; Subtract 1 from the width when any fringe has zero width,
+	   ;; not just the right fringe.  Bug#18601.
+	   (/= (frame-parameter nil 'left-fringe) 0)
 	   (/= (frame-parameter nil 'right-fringe) 0))
       (window-body-width)
     (1- (window-body-width))))