from trunk

diff --cc lisp/ChangeLog
index 9bc11ededa9d5be44cbb342250f03e6183e725cb,725377aba958f0dc327cfa97a9fd833b6090294b..1b9871d8291cb6c3678b3a31c947c9b0e51a79ea
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,15 -1,49 +1,62 @@@
-       (setup-default-fontset): Likewise.
 +2010-03-01  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/burmese.el (burmese-composable-pattern): Renamed from
 +      myanmar-composable-pattern.
 +
 +      * international/characters.el (script-list): Change myanmar to
 +      burmese.
 +
 +      * international/fontset.el (script-representative-chars): Change
 +      myanmar to burmese.
 +      (otf-script-alist): Likewise.
++      (setup-default-fontset): Likewise.  Re-fix :otf spec.
++
+ 2010-03-01  Alan Mackenzie  <bug-cc-mode@gnu.org>
+ 
+       * cc-engine.el (c-remove-stale-state-cache): Take account of when
+       `good-pos' is in the same macro as `here'.  Fixes bug 5649.
+ 
+ 2010-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * menu-bar.el (menu-bar-manuals-menu): Fix typo.
+ 
+ 2010-02-28  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * scroll-bar.el (scroll-bar-drag-1): Add save-excursion, bug #5654.
+ 
+ 2010-02-28  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/tramp.el (tramp-handle-write-region): START can be a string.
+       Take care in the checks.  Reported by Dan Davison
+       <davison@stats.ox.ac.uk>.
+ 
+ 2010-02-28  Michael Albinus  <michael.albinus@gmx.de>
+ 
+       * net/dbus.el (dbus-introspect, dbus-get-property)
+       (dbus-set-property, dbus-get-all-properties): Use
+       `dbus-call-method' when noninteractive.  (Bug#5645)
+ 
+ 2010-02-28  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * textmodes/reftex-toc.el (reftex-toc-promote-prepare):
+       * emacs-lisp/elint.el (elint-add-required-env):
+       * cedet/semantic/db-find.el
+       (semanticdb-find-translate-path-brutish-default):
+       * cedet/ede/make.el (ede-make-check-version):
+       * calendar/icalendar.el (icalendar--add-diary-entry):
+       * calc/calcalg2.el (math-tracing-integral):
+       * files.el (recover-session-finish): Use with-current-buffer
+       instead of save-excursion.
+ 
+ 2010-02-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       Fix in-buffer completion when after-change-functions modify the buffer.
+       * minibuffer.el (completion--replace): New function.
+       (completion--do-completion): Use it and use relative movement.
+ 
+ 2010-02-27  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * international/fontset.el (setup-default-fontset): Fix :otf spec.
  
  2010-02-27  Jeremy Whitlock  <jcscoobyrs@gmail.com>  (tiny change)
  

diff --cc lisp/international/fontset.el
index 969f9a96551b1db3680ee9614824cc6e694da521,609e018aa7e6e0a553a5f4fcebfb1f6473208673..ecb2088de89fc17d4fa19dc3d189d1f0fc1db71b
--- 1/lisp/international/fontset.el
--- 2/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@@ -415,8 -415,8 +415,8 @@@
       (sinhala ,(font-spec :registry "iso10646-1" :otf '(sinh nil (akhn))))
       (malayalam ,(font-spec :registry "iso10646-1" :otf '(mlym nil (akhn))))
  
-      (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr))
 -     (myanmar ,(font-spec :registry "iso10646-1" :otf '(mymr brm (liga mark)))
 -            ,(font-spec :registry "iso10646-1" :script 'myanmar))
++     (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr nil nil))
 +            ,(font-spec :registry "iso10646-1" :script 'burmese))
  
       (lao ,(font-spec :registry "iso10646-1" :otf '(lao\  nil nil (mark)))
          ,(font-spec :registry "iso10646-1" :script 'lao)