aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2010-01-13 16:38:28 +0100
committerJuanma Barranquero2010-01-13 16:38:28 +0100
commit768c0c0f393d4e71e3973add8d557f6535c78342 (patch)
treea87ff5b0a1553182d8fdad1b507c78436c10377c
parentd77b5977da9e997387c0da34df1eb994951889b8 (diff)
downloademacs-768c0c0f393d4e71e3973add8d557f6535c78342.tar.gz
emacs-768c0c0f393d4e71e3973add8d557f6535c78342.zip
Fix typos in comments and ChangeLogs.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--lib-src/emacsclient.c2
-rw-r--r--src/emacs.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 6df40fb6255..8ca2b187d94 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -6735,8 +6735,8 @@
6735 6735
67361998-04-06 Andreas Schwab <schwab@gnu.org> 67361998-04-06 Andreas Schwab <schwab@gnu.org>
6737 6737
6738 * Makefile.in (ENVADD): Enviroment vars to pass to texi2dvi. Use 6738 * Makefile.in (ENVADD): Environment vars to pass to texi2dvi.
6739 it in dvi targets. 6739 Use it in dvi targets.
6740 6740
67411997-09-23 Paul Eggert <eggert@twinsun.com> 67411997-09-23 Paul Eggert <eggert@twinsun.com>
6742 6742
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index cabec8f7fb1..c4ef9ebf3ae 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -6180,8 +6180,8 @@
6180 6180
61811998-04-06 Andreas Schwab <schwab@gnu.org> 61811998-04-06 Andreas Schwab <schwab@gnu.org>
6182 6182
6183 * Makefile.in (ENVADD): Enviroment vars to pass to texi2dvi. Use 6183 * Makefile.in (ENVADD): Environment vars to pass to texi2dvi.
6184 it in dvi targets. 6184 Use it in dvi targets.
6185 (../etc/GNU): Change to $(srcdir) first. 6185 (../etc/GNU): Change to $(srcdir) first.
6186 6186
61871998-03-11 Carsten Dominik <cd@delysid.gnu.org> 61871998-03-11 Carsten Dominik <cd@delysid.gnu.org>
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 550072900f0..01241b518bb 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -340,7 +340,7 @@ w32_get_resource (predefined, key, type)
340/* 340/*
341 getenv wrapper for Windows 341 getenv wrapper for Windows
342 342
343 This is needed to duplicate Emacs's behavior, which is to look for enviroment 343 This is needed to duplicate Emacs's behavior, which is to look for environment
344 variables in the registry if they don't appear in the environment. 344 variables in the registry if they don't appear in the environment.
345*/ 345*/
346char * 346char *
diff --git a/src/emacs.c b/src/emacs.c
index dc19c13e8a8..2f73e8b837a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -157,7 +157,7 @@ void *malloc_state_ptr;
157extern void *malloc_get_state (); 157extern void *malloc_get_state ();
158/* From glibc, a routine that overwrites the malloc internal state. */ 158/* From glibc, a routine that overwrites the malloc internal state. */
159extern int malloc_set_state (); 159extern int malloc_set_state ();
160/* Non-zero if the MALLOC_CHECK_ enviroment variable was set while 160/* Non-zero if the MALLOC_CHECK_ environment variable was set while
161 dumping. Used to work around a bug in glibc's malloc. */ 161 dumping. Used to work around a bug in glibc's malloc. */
162int malloc_using_checking; 162int malloc_using_checking;
163#endif 163#endif