aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2011-11-15 01:54:19 +0100
committerJuanma Barranquero2011-11-15 01:54:19 +0100
commit0d26e0b62b7d01e3cb6eb57943269b8f25e53cd6 (patch)
tree784b0f664bd50cf4bc244141190d8b9c92973835 /src
parent947cd66b9611a5c4c4eb60238022e72fe51e2e46 (diff)
downloademacs-0d26e0b62b7d01e3cb6eb57943269b8f25e53cd6.tar.gz
emacs-0d26e0b62b7d01e3cb6eb57943269b8f25e53cd6.zip
Fix typos.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.82
-rw-r--r--src/ralloc.c16
-rw-r--r--src/xterm.h2
3 files changed, 10 insertions, 10 deletions
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 0bb96b55c30..00e4a1f62c8 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -2196,7 +2196,7 @@
2196 2196
21971999-09-14 Gerd Moellmann <gerd@gnu.org> 21971999-09-14 Gerd Moellmann <gerd@gnu.org>
2198 2198
2199 * sound.c (Fplay_sound): Remove usused variables. 2199 * sound.c (Fplay_sound): Remove unused variables.
2200 (be2hs): Put in #if 0 because it's currently not used. 2200 (be2hs): Put in #if 0 because it's currently not used.
2201 2201
22021999-09-14 Ken Raeburn <raeburn@gnu.org> 22021999-09-14 Ken Raeburn <raeburn@gnu.org>
diff --git a/src/ralloc.c b/src/ralloc.c
index 50d322523c1..62189ad8fc7 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -219,13 +219,13 @@ find_heap (POINTER address)
219 If enough space is not presently available in our reserve, this means 219 If enough space is not presently available in our reserve, this means
220 getting more page-aligned space from the system. If the returned space 220 getting more page-aligned space from the system. If the returned space
221 is not contiguous to the last heap, allocate a new heap, and append it 221 is not contiguous to the last heap, allocate a new heap, and append it
222 to the heap list.
222 223
223 obtain does not try to keep track of whether space is in use 224 obtain does not try to keep track of whether space is in use or not
224 or not in use. It just returns the address of SIZE bytes that 225 in use. It just returns the address of SIZE bytes that fall within a
225 fall within a single heap. If you call obtain twice in a row 226 single heap. If you call obtain twice in a row with the same arguments,
226 with the same arguments, you typically get the same value. 227 you typically get the same value. It's the caller's responsibility to
227 to the heap list. It's the caller's responsibility to keep 228 keep track of what space is in use.
228 track of what space is in use.
229 229
230 Return the address of the space if all went well, or zero if we couldn't 230 Return the address of the space if all went well, or zero if we couldn't
231 allocate the memory. */ 231 allocate the memory. */
@@ -389,7 +389,7 @@ find_bloc (POINTER *ptr)
389 while (p != NIL_BLOC) 389 while (p != NIL_BLOC)
390 { 390 {
391 /* Consistency check. Don't return inconsistent blocs. 391 /* Consistency check. Don't return inconsistent blocs.
392 Don't abort here, as callers might be expecting this, but 392 Don't abort here, as callers might be expecting this, but
393 callers that always expect a bloc to be returned should abort 393 callers that always expect a bloc to be returned should abort
394 if one isn't to avoid a memory corruption bug that is 394 if one isn't to avoid a memory corruption bug that is
395 difficult to track down. */ 395 difficult to track down. */
@@ -1180,7 +1180,7 @@ r_alloc_reset_variable (POINTER *old, POINTER *new)
1180 1180
1181 /* Find the bloc that corresponds to the data pointed to by pointer. 1181 /* Find the bloc that corresponds to the data pointed to by pointer.
1182 find_bloc cannot be used, as it has internal consistency checks 1182 find_bloc cannot be used, as it has internal consistency checks
1183 which fail when the variable needs reseting. */ 1183 which fail when the variable needs resetting. */
1184 while (bloc != NIL_BLOC) 1184 while (bloc != NIL_BLOC)
1185 { 1185 {
1186 if (bloc->data == *new) 1186 if (bloc->data == *new)
diff --git a/src/xterm.h b/src/xterm.h
index e10a6bc34f0..1d2ce9a2d3c 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -330,7 +330,7 @@ struct x_display_info
330 ptrdiff_t x_dnd_atoms_length; 330 ptrdiff_t x_dnd_atoms_length;
331 331
332 /* Extended window manager hints, Atoms supported by the window manager and 332 /* Extended window manager hints, Atoms supported by the window manager and
333 atoms for settig the window type. */ 333 atoms for setting the window type. */
334 Atom Xatom_net_supported, Xatom_net_supporting_wm_check; 334 Atom Xatom_net_supported, Xatom_net_supporting_wm_check;
335 Atom *net_supported_atoms; 335 Atom *net_supported_atoms;
336 int nr_net_supported_atoms; 336 int nr_net_supported_atoms;