Merge from origin/emacs-24

[gnu-emacs] / admin / grammars / python.wy

diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 02fb7390b010e1354f07868a5635aad228e633a9..9b37a8deaec93e5b0bbcbf4ef647c68f094a0d10 100644 (file)
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -1,6 +1,6 @@
 ;;; python.wy -- LALR grammar for Python
 
-;; Copyright (C) 2002-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 ;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
@@ -91,8 +91,12 @@
 %provide semantic/wisent/python-wy
 
 %{
-(declare-function wisent-python-reconstitute-function-tag "semantic/wisent/python")
-(declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python")
+(declare-function wisent-python-reconstitute-function-tag
+                 "semantic/wisent/python" (tag suite))
+(declare-function wisent-python-reconstitute-class-tag "semantic/wisent/python"
+                 (tag))
+(declare-function semantic-parse-region "semantic"
+                 (start end &optional nonterminal depth returnonerror))
 }
 
 %languagemode python-mode