Merge from origin/emacs-25

[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 beba31e71ad5ddcdfc278d0194aa9fe1d4af69ba..d417d1c415223bc56f4234497d5216a0352fc59f 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-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2009-2016 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -387,12 +387,12 @@
                 (let
                     ((s $1))
                   (if
-                      (string-match "^{[\r\n     ]*" s)
+                      (string-match "^{[\r\n\t ]*" s)
                       (setq s
                             (substring s
                                        (match-end 0))))
                   (if
-                      (string-match "[\r\n       ]*}$" s)
+                      (string-match "[\r\n\t ]*}$" s)
                       (setq s
                             (substring s 0
                                        (match-beginning 0))))