mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

terminal-init-w32console mimicks command-line

Browse source 
Problem reported by Eli Zaretskii.
* lisp/startup.el (startup--setup-quote-display):
New function, refactored from a part of ‘command-line’.
(command-line): Use it.
* lisp/term/w32console.el (terminal-init-w32console):
Use it, so that this function stays consistent with ‘command-line’.
This commit is contained in:
Paul Eggert 2015-09-01 12:06:00 -07:00
parent 1a3518e7c3
commit 183ad9d597
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lisp/startup.el
View file

@ -803,6 +803,15 @@ to prepare for opening the first frame (e.g. open a connection to an X server)."
(defvar server-name)
(defvar server-process)
(defun startup--setup-quote-display ()
"If curved quotes don't work, display ASCII approximations."
(dolist (char-repl '((?‘ . ?\`) (?’ . ?\') (?“ . ?\") (?” . ?\")))
(when (not (char-displayable-p (car char-repl)))
(unless standard-display-table
(setq standard-display-table (make-display-table)))
(aset standard-display-table (car char-repl)
(vector (make-glyph-code (cdr char-repl) 'shadow))))))
(defun command-line ()
"A subroutine of `normal-top-level'.
Amongst another things, it parses the command-line arguments."
@ -1017,13 +1026,7 @@ please check its value")
'("no" "off" "false" "0")))))
(setq no-blinking-cursor t))
;; If curved quotes don't work, display ASCII approximations.
(dolist (char-repl '((?‘ . ?\`) (?’ . ?\') (?“ . ?\") (?” . ?\")))
(when (not (char-displayable-p (car char-repl)))
(or standard-display-table
(setq standard-display-table (make-display-table)))
(aset standard-display-table (car char-repl)
(vector (make-glyph-code (cdr char-repl) 'shadow)))))
(startup--setup-quote-display)
(setq internal--text-quoting-flag t)
;; Re-evaluate predefined variables whose initial value depends on

7
lisp/term/w32console.el
View file

@ -68,12 +68,7 @@
(if oem-o-cs-p oem-code-page-output-coding oem-code-page-coding))
;; Since we changed the terminal encoding, we need to repeat
;; the test for Unicode quotes being displayable.
(dolist (char-repl
'((?‘ . [?\`]) (?’ . [?\']) (?“ . [?\"]) (?” . [?\"])))
(when (not (char-displayable-p (car char-repl)))
(or standard-display-table
(setq standard-display-table (make-display-table)))
(aset standard-display-table (car char-repl) (cdr char-repl))))))
(startup--setup-quote-display)))
(let* ((colors w32-tty-standard-colors)
(color (car colors)))
(tty-color-clear)