;;; term.el --- general command interpreter in a window stuff
-;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2013 Free Software
+;; Copyright (C) 1988, 1990, 1992, 1994-1995, 2001-2014 Free Software
;; Foundation, Inc.
;; Author: Per Bothner <per@bothner.com>
(display-graphic-p)
overflow-newline-into-fringe
(/= (frame-parameter nil 'right-fringe) 0))
- (window-width)
- (1- (window-width))))
+ (window-body-width)
+ (1- (window-body-width))))
\f
(put 'term-mode 'mode-class 'special)
(setq this-command 'yank)
(mouse-set-point click)
(term-send-raw-string
- (or (cond ; From `mouse-yank-primary':
- ((eq system-type 'windows-nt)
- (or (x-get-selection 'PRIMARY)
- (x-get-selection-value)))
- ((fboundp 'x-get-selection-value)
- (or (x-get-selection-value)
- (x-get-selection 'PRIMARY)))
- (t
- (x-get-selection 'PRIMARY)))
+ ;; 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")))))
(defun term-paste ()
(let ((end (string-match "\r?$" str i)))
(if end
(funcall term-command-hook
- (prog1 (substring str (1+ i) end)
- (setq i (match-end 0))))
+ (decode-coding-string
+ (prog1 (substring str (1+ i) end)
+ (setq i (match-end 0)))
+ locale-coding-system))
(setq term-terminal-parameter (substring str i))
(setq term-terminal-state 4)
(setq i str-length))))
(if (< down 0) term-scroll-start term-scroll-end))))
(when (or (and (< down 0) (< scroll-needed 0))
(and (> down 0) (> scroll-needed 0)))
- (let ((save-point (copy-marker (point))) (save-top))
+ (let ((save-point (point-marker)) (save-top))
(goto-char term-home-marker)
(cond (term-scroll-with-delete
(if (< down 0)
(and (consp first)
(eq (window-buffer (posn-window (event-start first)))
(get-buffer "*Completions*"))
- (eq (key-binding key) 'mouse-choose-completion)))
- ;; If the user does mouse-choose-completion with the mouse,
+ (memq (key-binding key)
+ '(mouse-choose-completion choose-completion))))
+ ;; If the user does choose-completion with the mouse,
;; execute the command, then delete the completion window.
(progn
(choose-completion first)