From: Kenichi Handa <handa@etlken>
Date: Thu, 27 May 2010 07:08:37 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=478ebb73bb3b80bf2a0a55081f9753639d98fd4a;p=emacs.git

merge trunk
---

478ebb73bb3b80bf2a0a55081f9753639d98fd4a
diff --cc lisp/ChangeLog
index e72dfd2614b,10fbaee01c5..10cd04ec60d
--- a/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.