Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f8650c8cc70..d726ec108a2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-27  Yuri Shtil  <yuris@juniper.net>  (tiny change)
+
+        * etags.c (Perl_functions): Fix call to skip_spaces.
+
 2008-02-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (NO_SHORTNAMES):
diff --git a/lib-src/etags.c b/lib-src/etags.c
index d71f849d2c1..2fe0c6314fd 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4552,7 +4552,7 @@ Perl_functions (inf)
 
   LOOP_ON_INPUT_LINES (inf, lb, cp)
     {
-      skip_spaces(cp);
+      cp = skip_spaces (cp);
 
       if (LOOKING_AT (cp, "package"))
         {