* lisp/files.el (file-tree-walk): Remove; of unknown authorship.

[gnu-emacs] / lisp / term.el

diff --git a/lisp/term.el b/lisp/term.el
index 825a202c04643f955516db6a1eb372508b694e2a..a629af90d3e8f1279bd50b4eef4c043fe34c190f 100644 (file)
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1,6 +1,6 @@
 ;;; term.el --- general command interpreter in a window stuff
 
-;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2014 Free Software
+;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2015 Free Software
 ;; Foundation, Inc.
 
 ;; Author: Per Bothner <per@bothner.com>
@@ -972,6 +972,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))))
@@ -1249,16 +1252,7 @@ without any interpretation."
     (run-hooks 'mouse-leave-buffer-hook)
     (setq this-command 'yank)
     (mouse-set-point click)
-    (term-send-raw-string
-     ;; From `mouse-yank-primary':
-     (or (if (fboundp 'x-get-selection-value)
-             (if (eq system-type 'windows-nt)
-                 (or (x-get-selection 'PRIMARY)
-                     (x-get-selection-value))
-               (or (x-get-selection-value)
-                   (x-get-selection 'PRIMARY)))
-          (x-get-selection 'PRIMARY))
-        (error "No selection is available")))))
+    (term-send-raw-string (gui-get-primary-selection))))
 
 (defun term-paste ()
   "Insert the last stretch of killed text at point."