From: Kenichi Handa <handa@etlken>
Date: Wed, 19 May 2010 01:16:01 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~207
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ba3dd48988911d24100dad2b67e5b45189083dd;p=emacs.git

merge trunk
---

9ba3dd48988911d24100dad2b67e5b45189083dd
diff --cc lisp/ChangeLog
index d0fc357c4ea,ab45bf149f8..545311d6530
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,40 +1,46 @@@
 +2010-05-19  Kenichi Handa  <handa@m17n.org>
 +
 +	* composite.el: Register compose-gstring-for-graphic in
 +	composition-function-table only for combining characters (Mn, Mc,
 +	Me).
 +
+ 2010-05-18  Jay Belanger  <jay.p.belanger@gmail.com>
+ 
+ 	* calc/calc-trail.el (calc-trail-isearch-forward)
+ 	(calc-trail-isearch-backward): Ensure that the new window
+ 	point is set correctly.
+ 
+ 2010-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* subr.el (read-quoted-char): Resolve modifiers after key
+ 	remapping (bug#6212).
+ 
+ 2010-05-18  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	Add visualization code for secrets.
+ 	* net/secrets.el (secrets-mode): New major mode.
+ 	(secrets-show-secrets, secrets-show-collections)
+ 	(secrets-expand-collection, secrets-expand-item)
+ 	(secrets-tree-widget-after-toggle-function)
+ 	(secrets-tree-widget-show-password): New defuns.
+ 
+ 2010-05-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* emacs-lisp/smie.el (smie-next-sexp): Break inf-loop at BOB.
+ 	(smie-backward-sexp, smie-forward-sexp): Remove boundary condition now
+ 	handled in smie-next-sexp.
+ 	(smie-indent-calculate): Provide a starting indentation (so the
+ 	recursion is well-founded ;-).
+ 
+ 	Fix handling of non-associative equal levels.
+ 	* emacs-lisp/smie.el (smie-prec2-levels): Choose distinct levels even
+ 	when it's not needed.
+ 	(smie-op-left, smie-op-right): New functions.
+ 	(smie-next-sexp): New function, extracted from smie-backward-sexp.
+ 	Better handle equal levels to distinguish the associative case from
+ 	the "multi-keyword construct" case.
+ 	(smie-backward-sexp, smie-forward-sexp): Use it.
+ 
  2010-05-18  Juanma Barranquero  <lekktu@gmail.com>
  
  	* progmodes/prolog.el (smie-indent-basic): Declare for byte-compiler.