aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-05-13 11:08:56 -0700
committerPaul Eggert2011-05-13 11:08:56 -0700
commit66699ad31291ec329760966945ec4d4ad4688586 (patch)
treef639e80b772f3accc8c23c40fe0dbf112697dd12 /src
parent2d165e9dc58924db64f73791a638c136bc6324d7 (diff)
downloademacs-66699ad31291ec329760966945ec4d4ad4688586.tar.gz
emacs-66699ad31291ec329760966945ec4d4ad4688586.zip
* fns.c: Fix misspellings.
Diffstat (limited to 'src')
-rw-r--r--src/fns.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fns.c b/src/fns.c
index 47ded456c6e..16dc0fe0de2 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -457,10 +457,10 @@ concat (size_t nargs, Lisp_Object *args,
457 Lisp_Object prev; 457 Lisp_Object prev;
458 int some_multibyte; 458 int some_multibyte;
459 /* When we make a multibyte string, we can't copy text properties 459 /* When we make a multibyte string, we can't copy text properties
460 while concatinating each string because the length of resulting 460 while concatenating each string because the length of resulting
461 string can't be decided until we finish the whole concatination. 461 string can't be decided until we finish the whole concatenation.
462 So, we record strings that have text properties to be copied 462 So, we record strings that have text properties to be copied
463 here, and copy the text properties after the concatination. */ 463 here, and copy the text properties after the concatenation. */
464 struct textprop_rec *textprops = NULL; 464 struct textprop_rec *textprops = NULL;
465 /* Number of elements in textprops. */ 465 /* Number of elements in textprops. */
466 int num_textprops = 0; 466 int num_textprops = 0;
@@ -704,7 +704,7 @@ concat (size_t nargs, Lisp_Object *args,
704 make_number (0), 704 make_number (0),
705 make_number (SCHARS (this)), 705 make_number (SCHARS (this)),
706 Qnil); 706 Qnil);
707 /* If successive arguments have properites, be sure that the 707 /* If successive arguments have properties, be sure that the
708 value of `composition' property be the copy. */ 708 value of `composition' property be the copy. */
709 if (last_to_end == textprops[argnum].to) 709 if (last_to_end == textprops[argnum].to)
710 make_composition_value_copy (props); 710 make_composition_value_copy (props);
@@ -2076,7 +2076,7 @@ internal_equal (register Lisp_Object o1, register Lisp_Object o2, int depth, int
2076 return compare_window_configurations (o1, o2, 0); 2076 return compare_window_configurations (o1, o2, 0);
2077 2077
2078 /* Aside from them, only true vectors, char-tables, compiled 2078 /* Aside from them, only true vectors, char-tables, compiled
2079 functions, and fonts (font-spec, font-entity, font-ojbect) 2079 functions, and fonts (font-spec, font-entity, font-object)
2080 are sensible to compare, so eliminate the others now. */ 2080 are sensible to compare, so eliminate the others now. */
2081 if (size & PSEUDOVECTOR_FLAG) 2081 if (size & PSEUDOVECTOR_FLAG)
2082 { 2082 {
@@ -2782,7 +2782,7 @@ ITEM should be one of the following:
2782`months', returning a 12-element vector of month names (locale items MON_n); 2782`months', returning a 12-element vector of month names (locale items MON_n);
2783 2783
2784`paper', returning a list (WIDTH HEIGHT) for the default paper size, 2784`paper', returning a list (WIDTH HEIGHT) for the default paper size,
2785 both measured in milimeters (locale items PAPER_WIDTH, PAPER_HEIGHT). 2785 both measured in millimeters (locale items PAPER_WIDTH, PAPER_HEIGHT).
2786 2786
2787If the system can't provide such information through a call to 2787If the system can't provide such information through a call to
2788`nl_langinfo', or if ITEM isn't from the list above, return nil. 2788`nl_langinfo', or if ITEM isn't from the list above, return nil.