summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2013-03-08 11:57:29 -0700
committerTom Tromey <tromey@redhat.com>2013-03-08 11:57:29 -0700
commit71f91792e3013b397996905224f387da5cc539a9 (patch)
tree4c3d3ba909e76deea1cdf73b73fca67a57149465 /lib-src
parent6f4de085f065e11f4df3195d47479f28f5ef08ba (diff)
parentb5426561089d39f18b42bed9dbfcb531f43ed562 (diff)
downloademacs-71f91792e3013b397996905224f387da5cc539a9.tar.gz
merge from trunk
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/etags.c14
-rw-r--r--lib-src/movemail.c1
3 files changed, 11 insertions, 8 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2bdbebeb110..81876d86165 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-08 Paul Eggert <eggert@cs.ucla.edu>
+
+ * movemail.c (getenv): Remove decl (unused since 1994).
+
2013-01-15 Paul Eggert <eggert@cs.ucla.edu>
* make-docfile.c (write_globals): Make it a bit clearer (Bug#13448).
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ec96f45fc94..c1e12e95da4 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1,4 +1,4 @@
-/* Tags file maker to go with GNU Emacs -*- coding: latin-1 -*-
+/* Tags file maker to go with GNU Emacs -*- coding: utf-8 -*-
Copyright (C) 1984 The Regents of the University of California
@@ -64,12 +64,12 @@ University of California, as described above. */
* 1985 Emacs TAGS format by Richard Stallman.
* 1989 Sam Kendall added C++.
* 1992 Joseph B. Wells improved C and C++ parsing.
- * 1993 Francesco Potortì reorganized C and C++.
+ * 1993 Francesco Potortì reorganized C and C++.
* 1994 Line-by-line regexp tags by Tom Tromey.
- * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba).
- * 2002 #line directives by Francesco Potortì.
+ * 2001 Nested classes by Francesco Potortì (concept by Mykola Dzyuba).
+ * 2002 #line directives by Francesco Potortì.
*
- * Francesco Potortì <pot@gnu.org> has maintained and improved it since 1993.
+ * Francesco Potortì <pot@gnu.org> has maintained and improved it since 1993.
*/
/*
@@ -4275,7 +4275,7 @@ Asm_labels (FILE *inf)
* Perl variable names: /^(my|local).../
* Original code by Bart Robinson <lomew@cs.utah.edu> (1995)
* Additions by Michael Ernst <mernst@alum.mit.edu> (1997)
- * Ideas by Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> (2001)
+ * Ideas by Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> (2001)
*/
static void
Perl_functions (FILE *inf)
@@ -5105,7 +5105,7 @@ Texinfo_nodes (FILE *inf)
* Contents of <title>, <h1>, <h2>, <h3> are tags.
* Contents of <a name=xxx> are tags with name xxx.
*
- * Francesco Potortì, 2002.
+ * Francesco Potortì, 2002.
*/
static void
HTML_labels (FILE *inf)
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 616cbde5394..cf93fb78d98 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -665,7 +665,6 @@ popmail (char *mailbox, char *outfile, int preserve, char *password, int reverse
register int i;
int mbfi;
FILE *mbf;
- char *getenv (const char *);
popserver server;
int start, end, increment;
char *user, *hostname;