merge trunk

diff --cc lisp/ChangeLog
index e72dfd2614b882cbdf3cb1555c27d577ffdb4038,10fbaee01c509ed82e8d4b96c20d2c691325fb23..10cd04ec60d10cc1af2b01b34b07f50d763de2b8
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,25 +1,30 @@@
 +2010-05-27  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/hebrew.el (hebrew-shape-gstring): Check if a glyph
 +      element of GSTRING is nil.
 +
+ 2010-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * emacs-lisp/smie.el (smie-forward-token-function)
+       (smie-backward-token-function): New vars.
+       (smie-backward-sexp, smie-forward-sexp)
+       (smie-indent-hanging-p, smie-indent-calculate): Use them.
+       (smie-default-backward-token): Rename from smie-backward-token and
+       skip comments.
+       (smie-default-forward-token): Rename from smie-forward-token and
+       skip comments.
+       (smie-next-sexp): Handle nil results from next-token.
+       (smie-indent-calculate): Add a new case for special `fixindent' comments.
+ 
+ 2010-05-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * progmodes/ada-xref.el (ada-gnat-parse-gpr):
+       * emulation/edt.el (edt-load-keys): Avoid (expand-file-name ".").
+ 
+ 2010-05-26  Glenn Morris  <rgm@gnu.org>
+ 
+       * emulation/edt.el (edt-load-keys): Use locate-library.
+ 
  2010-05-25  Chong Yidong  <cyd@stupidchicken.com>
  
        * log-edit.el (log-edit-strip-single-file-name): Default to nil.