[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el

[Stefan Monnier]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.262 
emacs/lisp/international/mule-cmds.el:1.263
*** emacs/lisp/international/mule-cmds.el:1.262 Thu Nov 11 21:38:47 2004
--- emacs/lisp/international/mule-cmds.el       Thu Jan 27 14:47:32 2005
***************
*** 1,6 ****
  ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: 
iso-2022-7bit -*-
  
! ;; Copyright (C) 2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
  ;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
  ;; Licensed to the Free Software Foundation.
  
--- 1,6 ----
  ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: 
iso-2022-7bit -*-
  
! ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005  Free Software 
Foundation, Inc.
  ;; Copyright (C) 1995, 2003 Electrotechnical Laboratory, JAPAN.
  ;; Licensed to the Free Software Foundation.
  
***************
*** 1865,1876 ****
    ;; different there.
    (or (and (eq window-system 'pc) (not default-enable-multibyte-characters))
        (progn
!       ;; Make non-line-break space display as a plain space.
!       ;; Most X fonts do the wrong thing for code 160.
!       (aset standard-display-table 160 [32])
!       ;; With luck, non-Latin-1 fonts are more recent and so don't
!       ;; have this bug.
!       (aset standard-display-table (make-char 'latin-iso8859-1 160) [32])
        ;; Most Windows programs send out apostrophes as \222.  Most X fonts
        ;; don't contain a character at that position.  Map it to the ASCII
        ;; apostrophe.  [This is actually RIGHT SINGLE QUOTATION MARK,
--- 1865,1878 ----
    ;; different there.
    (or (and (eq window-system 'pc) (not default-enable-multibyte-characters))
        (progn
!       ;; Most X fonts used to do the wrong thing for latin-1 code 160.
!       (unless (and (eq window-system 'x)
!                    ;; XFree86 4 has fixed the fonts.
!                    (string= "The XFree86 Project, Inc" (x-server-vendor))
!                    (> (aref (number-to-string (nth 2 (x-server-version))) 0)
!                       ?3))
!         ;; Make non-line-break space display as a plain space.
!         (aset standard-display-table 160 [32]))
        ;; Most Windows programs send out apostrophes as \222.  Most X fonts
        ;; don't contain a character at that position.  Map it to the ASCII
        ;; apostrophe.  [This is actually RIGHT SINGLE QUOTATION MARK,
***************
*** 1878,1900 ****
        ;; fonts probably have the appropriate glyph at this position,
        ;; so they could use standard-display-8bit.  It's better to use a
        ;; proper windows-1252 coding system.  --fx]
!       (aset standard-display-table 146 [39])
!       ;; XFree86 4 has changed most of the fonts from their designed
!       ;; versions such that `' no longer appears as balanced quotes.
!       ;; Assume it has iso10646 fonts installed, so we can display
!       ;; balanced quotes.
!       (when (and (eq window-system 'x)
!                  (string= "The XFree86 Project, Inc" (x-server-vendor))
!                  (> (aref (number-to-string (nth 2 (x-server-version))) 0)
!                     ?3))
!         ;; We suppress these setting for the moment because the
!         ;; above assumption is wrong.
!         ;; (aset standard-display-table ?' [?$,1ry(B])
!         ;; (aset standard-display-table ?` [?$,1rx(B])
!         ;; The fonts don't have the relevant bug.
!         (aset standard-display-table 160 nil)
!         (aset standard-display-table (make-char 'latin-iso8859-1 160)
!               nil)))))
  
  (defun set-language-environment-coding-systems (language-name
                                                &optional eol-type)
--- 1880,1886 ----
        ;; fonts probably have the appropriate glyph at this position,
        ;; so they could use standard-display-8bit.  It's better to use a
        ;; proper windows-1252 coding system.  --fx]
!       (aset standard-display-table 146 [39]))))
  
  (defun set-language-environment-coding-systems (language-name
                                                &optional eol-type)
***************
*** 1955,1962 ****
        (setq language-name (symbol-name language-name)))
    (dolist (feature (get-language-info language-name 'features))
      (require feature))
!   (let ((doc (get-language-info language-name 'documentation))
!       pos)
      (help-setup-xref (list #'describe-language-environment language-name)
                     (interactive-p))
      (with-output-to-temp-buffer (help-buffer)
--- 1941,1947 ----
        (setq language-name (symbol-name language-name)))
    (dolist (feature (get-language-info language-name 'features))
      (require feature))
!   (let ((doc (get-language-info language-name 'documentation)))
      (help-setup-xref (list #'describe-language-environment language-name)
                     (interactive-p))
      (with-output-to-temp-buffer (help-buffer)