(latin1-display-reset):

Special-case arabic.
(latin1-char-displayable-p): Doc fix.

diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index e3fc6421cc2d5411b42bc32124c219ab4243e3d5..7f9d1f693e686d37a5ac8ff85aa58bbd38904976 100644 (file)
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -102,8 +102,7 @@ must be in `latin1-display-sets'.  With no arguments, reset the
 display for all of `latin1-display-sets'. See also
 `latin1-display-setup'.  As well as iso-8859 characters, this treats
 some characters in the `mule-unicode-...' charsets if you don't have
-a Unicode font with which to display them.
-"
+a Unicode font with which to display them."
   (if sets
       (progn
        (mapc #'latin1-display-setup sets)
@@ -124,16 +123,17 @@ a Unicode font with which to display them.
           (lambda (l)
             (apply 'latin1-display-char l))
           '((?\\9côòú ",") ;; SINGLE LOW-9 QUOTATION MARK
-            (?\\9côòþ ",,")      ;; DOUBLE LOW-9 QUOTATION MARK
+            (?\\9côòþ ",,") ;; DOUBLE LOW-9 QUOTATION MARK
             (?\\9côó¦ "...") ;; HORIZONTAL ELLIPSIS
             (?\\9côó° "o/oo") ;; PER MILLE SIGN
             (?\\9côó¹ "<") ;; SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-            (?\\9côòü "``")      ;; LEFT DOUBLE QUOTATION MARK
-            (?\\9côòý "''")      ;; RIGHT DOUBLE QUOTATION MARK
+            (?\\9côòü "``") ;; LEFT DOUBLE QUOTATION MARK
+            (?\\9côòý "''") ;; RIGHT DOUBLE QUOTATION MARK
             (?\\9côòó "-") ;; EN DASH
-            (?\\9côòô "--")      ;; EM DASH
-            (?\\9côõâ "TM")      ;; TRADE MARK SIGN
-            (?\\9côóº ">")))) ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+            (?\\9côòô "--") ;; EM DASH
+            (?\\9côõâ "TM") ;; TRADE MARK SIGN
+            (?\\9côóº ">") ;; SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+            )))
          (setq latin1-display t))
     (mapc #'latin1-display-reset latin1-display-sets)
     (aset standard-display-table
@@ -184,8 +184,10 @@ LANGUAGE is a symbol naming a language environment using an ISO8859
 character set."
   (if (eq language 'cyrillic)
       (setq language 'cyrillic-iso))
-  (let ((charset (car (remq 'ascii (get-language-info language
-                                                       'charset)))))
+  (let ((charset (if (eq language 'arabic)
+                    'arabic-iso8859-6
+                  (car (remq 'ascii (get-language-info language
+                                                       'charset))))))
     (standard-display-default (make-char charset 32)
                              (make-char charset 127)))
   (sit-for 0))
@@ -220,7 +222,8 @@ character set: `latin-2', `hebrew' etc."
                 ;; Now FONT-PATTERN is a string or a cons of family
                 ;; field pattern and registry field pattern.
                 (or (stringp font-pattern)
-                    (setq font-pattern (concat (or (car font-pattern) "*")
+                    (setq font-pattern (concat "-"
+                                               (or (car font-pattern) "*")
                                                "-*-"
                                                (cdr font-pattern))))
                 (x-list-fonts font-pattern 'default (selected-frame) 1)))))