aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2000-05-25 13:35:28 +0000
committerEli Zaretskii2000-05-25 13:35:28 +0000
commit1a4f9cc1094d499be2dd6342aa2706f420ea52b3 (patch)
treeb84dce2500b0c77e27d0655956d50f61dfc19378
parent02513cddf0ab030609c7aad78b82a66e083d5c0e (diff)
downloademacs-1a4f9cc1094d499be2dd6342aa2706f420ea52b3.tar.gz
emacs-1a4f9cc1094d499be2dd6342aa2706f420ea52b3.zip
(describe-char-after): Use
display-graphic-p instead of window-system, so that this function works on MS-DOS.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/international/mule-diag.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1af2eaeac42..5e3b3688aca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12000-05-25 Eli Zaretskii <eliz@is.elta.co.il> 12000-05-25 Eli Zaretskii <eliz@is.elta.co.il>
2 2
3 * international/mule-diag.el (describe-char-after): Use
4 display-graphic-p instead of window-system, so that this function
5 works on MS-DOS.
6
72000-05-25 Eli Zaretskii <eliz@is.elta.co.il>
8
3 * international/codepage.el (cp-make-coding-systems-for-codepage): 9 * international/codepage.el (cp-make-coding-systems-for-codepage):
4 Remove the eight-bit-graphic and eight-bit-control charsets from 10 Remove the eight-bit-graphic and eight-bit-control charsets from
5 the list of charsets which we convert into `?'. 11 the list of charsets which we convert into `?'.
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 67554dd180a..bfe64a7ffda 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -527,7 +527,7 @@ which font is being used for displaying the character."
527 (format "(encoded by coding system %S)" coding)) 527 (format "(encoded by coding system %S)" coding))
528 (list "not encodable by coding system" 528 (list "not encodable by coding system"
529 (symbol-name coding))))) 529 (symbol-name coding)))))
530 ,(if window-system 530 ,(if (display-graphic-p (selected-frame))
531 (list "font" (or (internal-char-font (point)) 531 (list "font" (or (internal-char-font (point))
532 "-- none --")) 532 "-- none --"))
533 (list "terminal code" 533 (list "terminal code"