diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 01:18:31 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-11-19 01:18:31 -0800 |
commit | 5396468298b0122469e0b41da8f49860d99a2b51 (patch) | |
tree | 4bd0a6db55e2c374402f88299b6347146719566f /src | |
parent | 7430c2a1791cc9fdd51b588998d26315489ac0d8 (diff) | |
download | emacs-5396468298b0122469e0b41da8f49860d99a2b51.tar.gz |
Spelling fixes.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog.11 | 2 | ||||
-rw-r--r-- | src/ChangeLog.3 | 4 | ||||
-rw-r--r-- | src/buffer.c | 2 | ||||
-rw-r--r-- | src/buffer.h | 2 | ||||
-rw-r--r-- | src/chartab.c | 2 | ||||
-rw-r--r-- | src/fileio.c | 2 | ||||
-rw-r--r-- | src/fns.c | 2 | ||||
-rw-r--r-- | src/ftxfont.c | 2 | ||||
-rw-r--r-- | src/image.c | 2 | ||||
-rw-r--r-- | src/intervals.c | 2 | ||||
-rw-r--r-- | src/keyboard.c | 2 | ||||
-rw-r--r-- | src/lisp.h | 2 | ||||
-rw-r--r-- | src/lread.c | 2 | ||||
-rw-r--r-- | src/msdos.c | 2 | ||||
-rw-r--r-- | src/print.c | 2 | ||||
-rw-r--r-- | src/w32term.c | 6 | ||||
-rw-r--r-- | src/xdisp.c | 2 | ||||
-rw-r--r-- | src/xmenu.c | 2 | ||||
-rw-r--r-- | src/xterm.c | 2 |
19 files changed, 22 insertions, 22 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 73ac5fd4e00..f8b38554781 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -13149,7 +13149,7 @@ (ftfont_has_char): Special handling of `ja' and `ko' adstyle. * font.c (font_sort_entites): Change the meaning of the arg - BEST-ONLY. Don't optimize for VEC of lenght 1. + BEST-ONLY. Don't optimize for VEC of length 1. (font_select_entity): Just return the value of font_sort_entites. * xfaces.c (merge_face_vectors): Reflect font properties in diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index cdfe63fc59c..9ce7828fac9 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -13137,7 +13137,7 @@ * print.c: Include dispextern.h. (printchar, strout): Use message_buf. - * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLenght. + * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLength. * term.c: Likewise. * scroll.c (CalcIDCosts, CalcIDCosts1, CalcLID): These now take a @@ -13147,7 +13147,7 @@ (do_scrolling): Use alloca for queue. * dispnew.c (remake_screen_structures): Allocate message_buf. - Don't use MscreenWidth, MscreenLenght. + Don't use MscreenWidth, MscreenLength. * xdisp.c: bf_cur replaced with current_buffer. Calls to SetBfx deleted. diff --git a/src/buffer.c b/src/buffer.c index 90b43d29fc8..8bc6e37732d 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4439,7 +4439,7 @@ static int mmap_initialized_p; #define MMAP_ALLOCATED_P(start, end) 1 #endif -/* Perform necessary intializations for the use of mmap. */ +/* Perform necessary initializations for the use of mmap. */ static void mmap_init (void) diff --git a/src/buffer.h b/src/buffer.h index a6b82abf053..fa65a4b81fd 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -978,7 +978,7 @@ extern int last_per_buffer_idx; variable has an index > 0 associated with it, except when it always has buffer-local values, in which case the index is -1. If this is 0, this is a bug and means that the slot of VAR in - buffer_local_flags wasn't intiialized. */ + buffer_local_flags wasn't initialized. */ #define PER_BUFFER_VAR_IDX(VAR) \ PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR)) diff --git a/src/chartab.c b/src/chartab.c index 724b3076a11..8d903749284 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -747,7 +747,7 @@ equivalent and can be merged. It defaults to `equal'. */) ARG is passed to C_FUNCTION when that is called. It returns the value of last character covered by TABLE (not the - value inheritted from the parent), and by side-effect, the car part + value inherited from the parent), and by side-effect, the car part of RANGE is updated to the minimum character C where C and all the following characters in TABLE have the same value. */ diff --git a/src/fileio.c b/src/fileio.c index 44a85ab1977..54fc67e6631 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -70,7 +70,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define IS_DRIVE(x) isalpha ((unsigned char) (x)) #endif /* Need to lower-case the drive letter, or else expanded - filenames will sometimes compare inequal, because + filenames will sometimes compare unequal, because `expand-file-name' doesn't always down-case the drive letter. */ #define DRIVE_LETTER(x) (tolower ((unsigned char) (x))) #endif diff --git a/src/fns.c b/src/fns.c index 392f447a6d8..04b51d10d9b 100644 --- a/src/fns.c +++ b/src/fns.c @@ -3252,7 +3252,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string, return decoded_string; } -/* Base64-decode the data at FROM of LENGHT bytes into TO. If +/* Base64-decode the data at FROM of LENGTH bytes into TO. If MULTIBYTE is nonzero, the decoded result should be in multibyte form. If NCHARS_RETRUN is not NULL, store the number of produced characters in *NCHARS_RETURN. */ diff --git a/src/ftxfont.c b/src/ftxfont.c index bbba3ca8163..608cfd8d44d 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -55,7 +55,7 @@ struct ftxfont_frame_data { /* Background and foreground colors. */ XColor colors[2]; - /* GCs interporationg the above colors. gcs[0] is for a color + /* GCs interpolating the above colors. gcs[0] is for a color closest to BACKGROUND, and gcs[5] is for a color closest to FOREGROUND. */ GC gcs[6]; diff --git a/src/image.c b/src/image.c index e80f2b72102..a82b16aa805 100644 --- a/src/image.c +++ b/src/image.c @@ -7786,7 +7786,7 @@ imagemagick_load_image (struct frame *f, struct image *img, goto imagemagick_error; } - /* Copy imagegmagick image to x with primitive yet robust pixel + /* Copy imagemagick image to x with primitive yet robust pixel pusher loop. This has been tested a lot with many different images. */ diff --git a/src/intervals.c b/src/intervals.c index 35d05d021f0..05b7175ac3f 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1900,7 +1900,7 @@ set_point (EMACS_INT charpos) current buffer, and the invisible property has a `stickiness' such that inserting a character at position POS would inherit the property it, return POS + ADJ, otherwise return POS. If TEST_INTANG is non-zero, - then intangibility is required as well as invisibleness. + then intangibility is required as well as invisibility. TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1. diff --git a/src/keyboard.c b/src/keyboard.c index 5d1784ad0b0..a4c85683061 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -10137,7 +10137,7 @@ will read just one key sequence. */) ! NILP (can_return_switch_frame), 0); #if 0 /* The following is fine for code reading a key sequence and - then proceeding with a lenghty computation, but it's not good + then proceeding with a lengthy computation, but it's not good for code reading keys in a loop, like an input method. */ #ifdef HAVE_WINDOW_SYSTEM if (display_hourglass_p) diff --git a/src/lisp.h b/src/lisp.h index 46448f7a1fb..695141321c9 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -943,7 +943,7 @@ struct Lisp_Vector /* Compute A OP B, using the unsigned comparison operator OP. A and B should be integer expressions. This is not the same as - mathemeatical comparison; for example, UNSIGNED_CMP (0, <, -1) + mathematical comparison; for example, UNSIGNED_CMP (0, <, -1) returns 1. For efficiency, prefer plain unsigned comparison if A and B's sizes both fit (after integer promotion). */ #define UNSIGNED_CMP(a, op, b) \ diff --git a/src/lread.c b/src/lread.c index 110f3e62f71..f1f6f0cbd78 100644 --- a/src/lread.c +++ b/src/lread.c @@ -3984,7 +3984,7 @@ init_obarray (void) Qnil = intern_c_string ("nil"); /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil, - so those two need to be fixed manally. */ + so those two need to be fixed manually. */ SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound); XSYMBOL (Qunbound)->function = Qunbound; XSYMBOL (Qunbound)->plist = Qnil; diff --git a/src/msdos.c b/src/msdos.c index 6b6e365a165..4c08c5b29e0 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1342,7 +1342,7 @@ static void IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos) { /* The offsets of source and destination relative to the - conventional memorty selector. */ + conventional memory selector. */ int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary; int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary; diff --git a/src/print.c b/src/print.c index 62bd048cf97..fc36d29da7c 100644 --- a/src/print.c +++ b/src/print.c @@ -1635,7 +1635,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag /* Detect circular list. */ if (NILP (Vprint_circle)) { - /* Simple but imcomplete way. */ + /* Simple but incomplete way. */ if (i != 0 && EQ (obj, halftail)) { sprintf (buf, " . #%"pMd, i / 2); diff --git a/src/w32term.c b/src/w32term.c index e9fa16ba325..18f5b85367c 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -4506,7 +4506,7 @@ w32_read_socket (struct terminal *terminal, int expected, } /* If window has been obscured or exposed by another window - being maximised or minimised/restored, then recheck + being maximized or minimized/restored, then recheck visibility of all frames. Direct changes to our own windows get handled by WM_SIZE. */ #if 0 @@ -5692,10 +5692,10 @@ x_make_frame_visible (struct frame *f) /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL causes unexpected behavior when unminimizing frames that were - previously maximised. But only SW_SHOWNORMAL works properly for + previously maximized. But only SW_SHOWNORMAL works properly for frames that were truely hidden (using make-frame-invisible), so we need it to avoid Bug#5482. It seems that async_iconified - is only set for minimised windows that are still visible, so + is only set for minimized windows that are still visible, so use that to determine the appropriate flag to pass ShowWindow. */ my_show_window (f, FRAME_W32_WINDOW (f), f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL); diff --git a/src/xdisp.c b/src/xdisp.c index ae19e11565b..1c913ca9612 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -15031,7 +15031,7 @@ redisplay_window (Lisp_Object window, int just_this_one_p) int current_matrix_up_to_date_p = 0; int used_current_matrix_p = 0; /* This is less strict than current_matrix_up_to_date_p. - It indictes that the buffer contents and narrowing are unchanged. */ + It indicates that the buffer contents and narrowing are unchanged. */ int buffer_unchanged_p = 0; int temp_scroll_step = 0; int count = SPECPDL_INDEX (); diff --git a/src/xmenu.c b/src/xmenu.c index 0dd652b566d..4b7bbfd73dc 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1304,7 +1304,7 @@ free_frame_menubar (FRAME_PTR f) #ifdef USE_MOTIF /* Removing the menu bar magically changes the shell widget's x and y position of (0, 0) which, when the menu bar is turned - on again, leads to pull-down menuss appearing in strange + on again, leads to pull-down menus appearing in strange positions near the upper-left corner of the display. This happens only with some window managers like twm and ctwm, but not with other like Motif's mwm or kwm, because the diff --git a/src/xterm.c b/src/xterm.c index 0da78ae1bb1..0e529714eb6 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -4184,7 +4184,7 @@ static Boolean xaw3d_arrow_scroll; /* Whether the drag scrolling maintains the mouse at the top of the thumb. If not, resizing the thumb needs to be done more carefully - to avoid jerkyness. */ + to avoid jerkiness. */ static Boolean xaw3d_pick_top; |