Merge branch master of git.sv.gnu.org:/srv/git/emacs.

[gnu-emacs] / lisp / cedet / semantic / grammar-wy.el

diff --git a/lisp/cedet/semantic/grammar-wy.el b/lisp/cedet/semantic/grammar-wy.el
index 8a33c8c8a1a0f8228d44a5740ed28155d06836b4..fba8adfcd75eb9e7b898e699e4cca37202893eca 100644 (file)
--- a/lisp/cedet/semantic/grammar-wy.el
+++ b/lisp/cedet/semantic/grammar-wy.el
@@ -1,6 +1,6 @@
 ;;; semantic/grammar-wy.el --- Generated parser support file
 
-;; Copyright (C) 2002-2004, 2009-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -23,9 +23,8 @@
 
 ;;; Code:
 
-(require 'semantic/lex)
-(eval-when-compile (require 'semantic/bovine))
-\f
+(require 'semantic)
+
 ;;; Prologue
 ;;
 (defvar semantic-grammar-lex-c-char-re)