diff options
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/mac-win.el | 6 | ||||
| -rw-r--r-- | lisp/term/tty-colors.el | 13 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 3 |
3 files changed, 12 insertions, 10 deletions
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index e42c2151701..c0ea7a9385e 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -141,6 +141,9 @@ (if clipboard (decode-coding-string clipboard selection-coding-system t))))) +;; Don't show the frame name; that's redundant. +(setq-default mode-line-frame-identification " ") + (defun mac-drag-n-drop (event) "Edit the files listed in the drag-n-drop event.\n\ Switch to a buffer editing the last file dropped." @@ -262,6 +265,9 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman") ;; Tell read-char how to convert special chars to ASCII (put 'return 'ascii-character 13) +(put 'tab 'ascii-character ?\t) +(put 'backspace 'ascii-character 127) +(put 'escape 'ascii-character ?\e) ;; ;; Available colors diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el index 956d46738df..1de35822b39 100644 --- a/lisp/term/tty-colors.el +++ b/lisp/term/tty-colors.el @@ -864,15 +864,10 @@ of gray, thus the name." (if (< mag 1) 0 (acos (/ (+ r g b) mag))))) (defun tty-color-approximate (rgb &optional frame) - "Given a list of 3 rgb values in RGB, find the color in `tty-color-alist' -which is the best approximation in the 3-dimensional RGB space, -and return its description. - -Value is a list of the form \(NAME INDEX R G B\). Note that the returned -NAME is not necessarily the same string as the argument COLOR, because -the latter might need to be approximated if it is not supported directly. - -Each value of the RGB triplet should be in the range 0..65535 range. + "Find the color in `tty-color-alist' that best approximates RGB. +Value is a list of the form \(NAME INDEX R G B\). +The argument RGB should be an rgb value, that is, a list of three +integers in the 0..65535 range. FRAME defaults to the selected frame." (let* ((color-list (tty-color-alist frame)) (candidate (car color-list)) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index d9700809413..61602d1f355 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -2212,7 +2212,8 @@ order until succeed.") (if utf8 (setq text (x-select-utf8-or-ctext utf8 ctext)) ;; Othewise, choose CTEXT. - (setq text ctext)))) + (setq text ctext)) + (setq text utf8))) ;; If not yet decided, try STRING. (or text (setq text (condition-case nil |