merge trunk

1 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b2f0ebd99e..2097f6c1973 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,12 @@
         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
@@ -26,6 +32,10 @@
         (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