merge trunk

diff --cc lisp/ChangeLog
index 1b2f0ebd99ecce194c326111c491350c3c1fadc0,168af7c4abe96a10e6a8a227bb35a1ead458589e..2097f6c1973bae775e1a170df21c89f9324c772e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,31 -1,13 +1,41 @@@
 +2010-08-06  Kenichi Handa  <handa@m17n.org>
 +
 +      * international/mule.el (define-charset): Store NAME as :base
 +      property.
 +      (ctext-non-standard-encodings-table): Pay attention to charset
 +      aliases.
 +      (ctext-pre-write-conversion): Sort ctext-standard-encodings by the
 +      current priority.  Force using the designation of the specific
 +      charset by adding `charset' text property.  Improve the whole
 +      algorithm.
 +
+ 2010-08-05  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * emulation/pc-select.el (pc-selection-mode-hook)
+       (copy-region-as-kill-nomark, beginning-of-buffer-mark)
+       (pc-selection-mode): Fix typos in docstrings.
+ 
 +2010-08-04  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/cyrillic.el: Don't add "microsoft-cp1251" to
 +      ctext-non-standard-encodings-alist here.
 +
 +      * international/mule.el (ctext-non-standard-encodings-alist): Add
 +      "koi8-r" and "microsoft-cp1251".
 +      (ctext-standard-encodings): New variable.
 +      (ctext-non-standard-encodings-table): List only elements for
 +      non-standard encodings.
 +      (ctext-pre-write-conversion): Adjusted for the above change.
 +      Check ctext-standard-encodings.
 +
 +      * international/mule-conf.el (compound-text): Doc fix.
 +      (ctext-no-compositions): Doc fix.
 +      (compound-text-with-extensions): Doc fix.
 +
+ 2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * simple.el (exchange-dot-and-mark): Mark obsolete, finally.
+ 
  2010-08-03  Juanma Barranquero  <lekktu@gmail.com>
  
        * progmodes/which-func.el (which-func-format): Split help-echo text