(term-window-width): Only use full window width on

window system if overflow-newline-into-fringe is enabled.
(term-mode): Don't disable overflow-newline-into-fringe.

diff --git a/lisp/term.el b/lisp/term.el
index 9866db7e29cb6e9bbde1a8ad3af96ad137f3a4d3..590a9b0a1d5bd0a1c2be381c6dc220b4aa2fe13d 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -925,7 +925,7 @@ is buffer-local.")
 (defun term-window-width ()
   (if (featurep 'xemacs)
       (1- (window-width))
-    (if window-system
+    (if (and window-system overflow-newline-into-fringe)
        (window-width)
       (1- (window-width)))))
 
@@ -988,8 +988,6 @@ Entry to this mode runs the hooks on `term-mode-hook'."
   (make-local-variable 'term-width)
   (setq term-width (term-window-width))
   (setq term-height (1- (window-height)))
-  (term-ifnot-xemacs
-   (set (make-local-variable 'overflow-newline-into-fringe) nil))
   (make-local-variable 'term-terminal-parameter)
   (make-local-variable 'term-saved-cursor)
   (make-local-variable 'term-last-input-start)