diff options
author | Stefan Kangas <stefankangas@gmail.com> | 2022-09-01 06:17:37 +0200 |
---|---|---|
committer | Stefan Kangas <stefankangas@gmail.com> | 2022-09-01 06:17:37 +0200 |
commit | 0bd860cc2e94e3f5178000e929af93863b9ae458 (patch) | |
tree | b5fca009a2b76625bf021ac69438fc3943cd47de /lisp/info.el | |
parent | e8085b1596b07543caadee1e4fa4f9061fbf3d8b (diff) | |
parent | 8807a4f53204674a796cb2db73716e09736b548e (diff) | |
download | emacs-0bd860cc2e94e3f5178000e929af93863b9ae458.tar.gz emacs-0bd860cc2e94e3f5178000e929af93863b9ae458.tar.bz2 emacs-0bd860cc2e94e3f5178000e929af93863b9ae458.zip |
Merge from origin/emacs-28
8807a4f532 Enable 256 colors in fbterm.
bbc23ca8ab One more fix for find-file.el
0cbcaf5119 ; Yet another doc fix for 'ff-other-file-alist' (bug#57325)
2d9a391727 Recommend using fbterm in the Linux console.
a5a92e577c ; * src/window.c (syms_of_window) <window-point-insertion-...
4d52fe6b96 * lisp/find-file.el (ff-other-file-alist): Doc fix. (Bug#...
d111b5b651 * lisp/info.el (Info-mode): Support the Linux console better.
cc945ec0ed ; Fix doc strings in latin1-disp.el
195fcc932e Improve the documentation of glyphless-character display
72ae02377e ; * lisp/jit-lock.el (jit-lock-chunk-size): Doc fix.
3fb69fad49 Fix documentation of 'glyphless-char-display'
# Conflicts:
# lisp/international/characters.el
# src/xdisp.c
Diffstat (limited to 'lisp/info.el')
-rw-r--r-- | lisp/info.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/info.el b/lisp/info.el index fb4c3fd7829..1a58910c3af 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -4451,9 +4451,12 @@ Advanced commands: (setq buffer-read-only t) (setq Info-tag-table-marker (make-marker)) (unless (or (display-multi-font-p) - (coding-system-equal - (coding-system-base (terminal-coding-system)) - 'utf-8)) + (and (coding-system-equal + (coding-system-base (terminal-coding-system)) + 'utf-8) + ;; The Linux console has limited character + ;; repertoire even when its encoding is UTF-8. + (not (equal (tty-type) "linux")))) (dolist (elt info-symbols-and-replacements) (let ((ch (car elt)) (repl (cdr elt))) |