merge trunk

diff --cc lisp/ChangeLog
index d0fc357c4eaccacd5a506bd7eb2f8df4c8e4ea87,ab45bf149f8aa211b30302bc1558f7166ce00e50..545311d6530b26cd68a52273d463edd601d709e3
--- 1/lisp/ChangeLog
--- 2/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.