[Emacs-diffs] Changes to emacs/lisp/disp-table.el

[YAMAMOTO Mitsuharu]

Index: emacs/lisp/disp-table.el
diff -c emacs/lisp/disp-table.el:1.57 emacs/lisp/disp-table.el:1.58
*** emacs/lisp/disp-table.el:1.57       Thu Sep  8 18:41:12 2005
--- emacs/lisp/disp-table.el    Fri Oct 21 08:26:54 2005
***************
*** 145,151 ****
    "Display character C as character SC in the g1 character set.
  This function assumes that your terminal uses the SO/SI characters;
  it is meaningless for an X frame."
!   (if (memq window-system '(x w32))
        (error "Cannot use string glyphs in a windowing system"))
    (or standard-display-table
        (setq standard-display-table (make-display-table)))
--- 145,151 ----
    "Display character C as character SC in the g1 character set.
  This function assumes that your terminal uses the SO/SI characters;
  it is meaningless for an X frame."
!   (if (memq window-system '(x w32 mac))
        (error "Cannot use string glyphs in a windowing system"))
    (or standard-display-table
        (setq standard-display-table (make-display-table)))
***************
*** 157,163 ****
    "Display character C as character GC in graphics character set.
  This function assumes VT100-compatible escapes; it is meaningless for an
  X frame."
!   (if (memq window-system '(x w32))
        (error "Cannot use string glyphs in a windowing system"))
    (or standard-display-table
        (setq standard-display-table (make-display-table)))
--- 157,163 ----
    "Display character C as character GC in graphics character set.
  This function assumes VT100-compatible escapes; it is meaningless for an
  X frame."
!   (if (memq window-system '(x w32 mac))
        (error "Cannot use string glyphs in a windowing system"))
    (or standard-display-table
        (setq standard-display-table (make-display-table)))
***************
*** 217,223 ****
               (equal (aref standard-display-table 161) [161])))
        (progn
        (standard-display-default 160 255)
!       (unless (or (memq window-system '(x w32)))
          (and (terminal-coding-system)
               (set-terminal-coding-system nil))))
  
--- 217,223 ----
               (equal (aref standard-display-table 161) [161])))
        (progn
        (standard-display-default 160 255)
!       (unless (or (memq window-system '(x w32 mac)))
          (and (terminal-coding-system)
               (set-terminal-coding-system nil))))