aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-02-19 06:44:03 -0800
committerPaul Eggert2013-02-19 06:44:03 -0800
commit8b17a8b9583e8e4af9d6a66ca7319a398040e19f (patch)
treee17b9d1ae613d1e1ce9830534527293b756fb7c7 /src
parent872faefb07a9196a583fc8cbe146ab6a2ebc9c2b (diff)
downloademacs-8b17a8b9583e8e4af9d6a66ca7319a398040e19f.tar.gz
emacs-8b17a8b9583e8e4af9d6a66ca7319a398040e19f.zip
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.102
-rw-r--r--src/lisp.h2
-rw-r--r--src/marker.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index c878c48a4f4..508a2a9dd4c 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -19171,7 +19171,7 @@
19171 * coding.c (code_convert_region_unwind): 19171 * coding.c (code_convert_region_unwind):
19172 Set Vlast_coding_system_used to the argument. 19172 Set Vlast_coding_system_used to the argument.
19173 (code_convert_region): If post-read-conversion function changed 19173 (code_convert_region): If post-read-conversion function changed
19174 the value of last-coding-sytem, keep the new value in 19174 the value of last-coding-system, keep the new value in
19175 coding->symbol so that it won't be overridden. 19175 coding->symbol so that it won't be overridden.
19176 (run_pre_post_conversion_on_str): Likewise. 19176 (run_pre_post_conversion_on_str): Likewise.
19177 (coding_system_accept_latin_extra_p): New function. 19177 (coding_system_accept_latin_extra_p): New function.
diff --git a/src/lisp.h b/src/lisp.h
index 44a5bd571ff..79fc9616d67 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3048,7 +3048,7 @@ extern Lisp_Object Qautomatic_gc;
3048extern Lisp_Object Qchar_table_extra_slots; 3048extern Lisp_Object Qchar_table_extra_slots;
3049extern struct Lisp_Vector *allocate_vector (EMACS_INT); 3049extern struct Lisp_Vector *allocate_vector (EMACS_INT);
3050 3050
3051/* Make an unitialized vector for SIZE objects. NOTE: you must 3051/* Make an uninitialized vector for SIZE objects. NOTE: you must
3052 be sure that GC cannot happen until the vector is completely 3052 be sure that GC cannot happen until the vector is completely
3053 initialized. E.g. the following code is likely to crash: 3053 initialized. E.g. the following code is likely to crash:
3054 3054
diff --git a/src/marker.c b/src/marker.c
index 0d992c0abfa..63027d3be5e 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -500,7 +500,7 @@ set_marker_internal (Lisp_Object marker, Lisp_Object position,
500 register ptrdiff_t charpos, bytepos; 500 register ptrdiff_t charpos, bytepos;
501 501
502 /* Do not use CHECK_NUMBER_COERCE_MARKER because we 502 /* Do not use CHECK_NUMBER_COERCE_MARKER because we
503 don't want to call buf_charpos_to_bytepos if POSTION 503 don't want to call buf_charpos_to_bytepos if POSITION
504 is a marker and so we know the bytepos already. */ 504 is a marker and so we know the bytepos already. */
505 if (INTEGERP (position)) 505 if (INTEGERP (position))
506 charpos = XINT (position), bytepos = -1; 506 charpos = XINT (position), bytepos = -1;