Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 164-184)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: man/mh-e.texi (Folders): Various edits.
   - Update from erc--emacs--0

 * gnus--rel--5.10  (patch 62-70)

   - Merge from emacs--devo--0
   - Update from CVS

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/gnus/mml.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/ldefs-boot.el
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/term/mac-win.el
index b08284731a4684bd78012e091984d29f8c10ec19,38795d38461f8fcae49d4f7b5b03467e0ab9a308..d2f373a1e8c494791d6d456953b6c3eacd647e45
--- 1/lisp/term/mac-win.el
--- 2/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@@ -1800,24 -1892,52 +1801,40 @@@ Optional 2nd arg FONTSET-NAME is a stri
  an appropriate name is generated automatically.
  
  It returns a name of the created fontset."
 -  (let ((fontset
 -       (create-fontset-from-ascii-font font resolved-font fontset-name)))
 -    (fontset-add-mac-fonts fontset t)
 -    fontset))
 +  (or resolved-font
 +      (setq resolved-font (x-resolve-font-name font)))
 +  (let ((base-family (aref (x-decompose-font-name resolved-font)
 +                         xlfd-regexp-family-subnum)))
 +    (if (string= base-family "*")
 +      (setq base-family nil))
 +    (new-fontset fontset-name (list (cons 'ascii resolved-font)))
 +    (fontset-add-mac-fonts fontset-name base-family)))
  
+ ;; Adjust Courier font specifications in x-fixed-font-alist.
+ (let ((courier-fonts (assoc "Courier" x-fixed-font-alist)))
+   (if courier-fonts
+       (dolist (label-fonts (cdr courier-fonts))
+       (setcdr label-fonts
+               (mapcar
+                (lambda (font)
+                  (if (string-match "\\`-adobe-courier-\\([^-]*\\)-\\(.\\)-\\(.*\\)-iso8859-1\\'" font)
+                      (replace-match
+                       (if (string= (match-string 2 font) "o")
+                           "-*-courier-\\1-i-\\3-*-*"
+                         "-*-courier-\\1-\\2-\\3-*-*")
+                       t nil font)
+                    font))
+                (cdr label-fonts))))))
+ 
  ;; Setup the default fontset.
  (setup-default-fontset)
 -(cond ((x-list-fonts "*-iso10646-1")
 -       ;; Use ATSUI (if available) for the following charsets.
 -       (dolist
 -         (charset '(latin-iso8859-1
 -                    latin-iso8859-2 latin-iso8859-3 latin-iso8859-4
 -                    thai-tis620 greek-iso8859-7 arabic-iso8859-6
 -                    hebrew-iso8859-8 cyrillic-iso8859-5
 -                    latin-iso8859-9 latin-iso8859-15 latin-iso8859-14
 -                    japanese-jisx0212 chinese-sisheng ipa
 -                    vietnamese-viscii-lower vietnamese-viscii-upper
 -                    lao ethiopic tibetan))
 -       (set-fontset-font nil charset '(nil . "iso10646-1"))))
 -      ((null (x-list-fonts "*-iso8859-1"))
 -       ;; Add Mac-encoding fonts unless ETL fonts are installed.
 -       (fontset-add-mac-fonts "fontset-default")))
  
  ;; Create a fontset that uses mac-roman font.  With this fontset,
 -;; characters decoded from mac-roman encoding (ascii, latin-iso8859-1,
 -;; and mule-unicode-xxxx-yyyy) are displayed by a mac-roman font.
 -(create-fontset-from-fontset-spec
 - "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-standard,
 -ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 -(fontset-add-mac-fonts "fontset-standard" t)
 +;; characters belonging to mac-roman charset (that contains ASCII and
 +;; more Latin characters) are displayed by a mac-roman font.
 +(create-fontset-from-mac-roman-font
 + "-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman" nil
 + "-apple-Monaco-normal-r-*-*-12-*-*-*-*-*-fontset-standard")
  
  ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
  (create-fontset-from-x-resource)

diff --cc man/cc-mode.texi
Simple merge

diff --cc src/.gdbinit
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge