Merge from CEDET upstream.

diff --cc admin/ChangeLog
index e31c7251ffb50b7b0b433cf5f10fe115c7a03561,54da0edf23f27cae74229575016f6e833ff3e3fb..f49061e35dfeaf20c2d71d3da7b6641a14155a31
--- 1/admin/ChangeLog
--- 2/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.