From: David Engster <dengste@eml.cc>
Date: Thu, 12 Dec 2013 22:09:15 +0000 (+0100)
Subject: Merge from CEDET upstream.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~441
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2cc82b9fbc6e67878e89d7006cc69ffb5227daa1;p=emacs.git

Merge from CEDET upstream.
---

2cc82b9fbc6e67878e89d7006cc69ffb5227daa1
diff --cc admin/ChangeLog
index e31c7251ffb,54da0edf23f..f49061e35df
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,16 -1,18 +1,31 @@@
+ 2013-12-12  David Engster  <deng@randomsample.de>
+ 
+ 	* grammars/c.by (expr-binop): Add MOD.
+ 	(variablearg): Add 'opt-assign'.
+ 	(variablearg, varnamelist): Add default values so that it can be
+ 	later expanded into the tag.
+ 	(opt-stuff-after-symbol): Rename to 'brackets-after-symbol' and
+ 	remove empty match.
+ 	(multi-stage-dereference): Adapt to above rename.
+ 	(unaryexpression): Use 'symbol' instead of 'namespace-symbol',
+ 	since the latter also leads to an empty match at the end which
+ 	would make this too greedy.
+ 	(variablearg-opt-name): Support parsing of function pointers
+ 	inside an argument list.
+ 
 +2013-12-12  Glenn Morris  <rgm@gnu.org>
 +
 +	* update_autogen (info_dir):
 +	Use dir_top from build-aux/ rather than admin/.
 +
 +	* update_autogen: Add option to generate info/dir.
 +	(Usage): Add -I.
 +	(info_flag): New variable.
 +	(-I): New option.
 +	(doc): Maybe check its status.
 +	(info_dir): New function.
 +	* dir_top: New file.
 +
  2013-12-11  Paul Eggert  <eggert@cs.ucla.edu>
  
  	Remove the option of using libcrypto.