diff options
Diffstat (limited to 'lisp/term/xterm.el')
| -rw-r--r-- | lisp/term/xterm.el | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index eeaf805930b..e63bf36cc3d 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -770,8 +770,7 @@ Can be nil to mean \"no timeout\".") By not redisplaying right away for xterm queries, we can avoid unsightly flashing during initialization. Give up and redisplay anyway if we've been waiting a little while." - (let ((start-time (current-time)) - (inhibit--record-char t)) + (let ((start-time (current-time))) (or (let ((inhibit-redisplay t)) (read-event nil nil xterm-query-redisplay-timeout)) (read-event nil nil @@ -839,8 +838,8 @@ We run the first FUNCTION whose STRING matches the input events." basemap (make-composed-keymap map (keymap-parent basemap)))) -(defun terminal-init-xterm () - "Terminal initialization function for xterm." +(defun xterm--init () + "Initialize the terminal for xterm." ;; rxvt terminals sometimes set the TERM variable to "xterm", but ;; rxvt's keybindings are incompatible with xterm's. It is ;; better in that case to use rxvt's initialization function. @@ -882,9 +881,18 @@ We run the first FUNCTION whose STRING matches the input events." ;; support it just ignore the sequence. (xterm--init-bracketed-paste-mode) ;; We likewise unconditionally enable support for focus tracking. - (xterm--init-focus-tracking) + (xterm--init-focus-tracking)) - (run-hooks 'terminal-init-xterm-hook)) +(defun terminal-init-xterm () + "Terminal initialization function for xterm." + (unwind-protect + (progn + (xterm--init) + ;; If the terminal initialization completed without errors, clear + ;; the lossage to discard the responses of the terminal emulator + ;; during initialization; otherwise they appear in the recent keys. + (clear-this-command-keys)) + (run-hooks 'terminal-init-xterm-hook))) (defun xterm--init-modify-other-keys () "Terminal initialization for xterm's modifyOtherKeys support." @@ -936,9 +944,10 @@ See `xterm--init-frame-title'" (defun xterm-set-window-title (&optional terminal) "Set the window title of the Xterm TERMINAL. The title is constructed from `frame-title-format'." - (send-string-to-terminal - (format "\e]2;%s\a" (format-mode-line frame-title-format)) - terminal)) + (unless (display-graphic-p terminal) + (send-string-to-terminal + (format "\e]2;%s\a" (format-mode-line frame-title-format)) + terminal))) (defun xterm--selection-char (type) (pcase type @@ -1007,10 +1016,9 @@ hitting screen's max DCS length." 'terminal-init-screen)) (bytes (encode-coding-string data 'utf-8-unix)) (base-64 (if screen - (replace-regexp-in-string + (string-replace "\n" "\e\\\eP" - (base64-encode-string bytes) - :fixedcase :literal) + (base64-encode-string bytes)) (base64-encode-string bytes :no-line-break))) (length (length base-64))) (if (> length xterm-max-cut-length) |