From: Kenichi Handa <handa@etlken>
Date: Fri, 6 Aug 2010 08:15:12 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-23.2.90~139^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f21a9669a44e1358e1f3164e4e1edd4e7000714e;p=emacs.git

merge trunk
---

f21a9669a44e1358e1f3164e4e1edd4e7000714e
diff --cc lisp/ChangeLog
index 1b2f0ebd99e,168af7c4abe..2097f6c1973
--- a/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