Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 259-273)

   - Update from CVS
   - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t
   - Merge from gnus--rel--5.10
   - Rename "field-at-point" to "field-at-pos"
   - (comint-insert-input): Remove redundant calls to setq and goto-char

 * gnus--rel--5.10  (patch 99-100)

   - Merge from emacs--devo--0
   - Update from CVS

2 files changed, 17 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 115e43c2d03..2e8581a6f57 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-02  Francesco Potort,Al(B  <pot@gnu.org>
+
+        * etags.c (Perl_functions): Free space allocated for var package.
+        (Erlang_functions): Possibly free space allocated for var last.
+        (Prolog_functions): Possibly free space allocated for var last.
+
 2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * sorted-doc.c (main): Initialize docs to NULL.
diff --git a/lib-src/etags.c b/lib-src/etags.c
index a7c98f090bb..e206443f39b 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -41,7 +41,7 @@
  * configuration file containing regexp definitions for etags.
  */
 
-char pot_etags_version[] = "@(#) pot revision number is 17.15";
+char pot_etags_version[] = "@(#) pot revision number is 17.17";
 
 #define TRUE    1
 #define FALSE   0
@@ -4543,6 +4543,7 @@ Perl_functions (inf)
                     lb.buffer, cp - lb.buffer + 1, lineno, linecharno);
         }
     }
+  free (package);
 }
 
 
@@ -5441,6 +5442,8 @@ Prolog_functions (inf)
           last[len] = '\0';
         }
     }
+  if (last != NULL)
+    free (last);
 }
 
 
@@ -5597,7 +5600,11 @@ Erlang_functions (inf)
       else if (cp[0] == '-')    /* attribute, e.g. "-define" */
         {
           erlang_attribute (cp);
-          last = NULL;
+          if (last != NULL)
+            {
+              free (last);
+              last = NULL;
+            }
         }
       else if ((len = erlang_func (cp, last)) > 0)
         {
@@ -5614,6 +5621,8 @@ Erlang_functions (inf)
           last[len] = '\0';
         }
     }
+  if (last != NULL)
+    free (last);
 }