diff options
| author | Paul Eggert | 2011-11-19 01:18:31 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-11-19 01:18:31 -0800 |
| commit | 5396468298b0122469e0b41da8f49860d99a2b51 (patch) | |
| tree | 4bd0a6db55e2c374402f88299b6347146719566f /src | |
| parent | 7430c2a1791cc9fdd51b588998d26315489ac0d8 (diff) | |
| download | emacs-5396468298b0122469e0b41da8f49860d99a2b51.tar.gz emacs-5396468298b0122469e0b41da8f49860d99a2b51.zip | |
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 @@ | |||
| 13149 | (ftfont_has_char): Special handling of `ja' and `ko' adstyle. | 13149 | (ftfont_has_char): Special handling of `ja' and `ko' adstyle. |
| 13150 | 13150 | ||
| 13151 | * font.c (font_sort_entites): Change the meaning of the arg | 13151 | * font.c (font_sort_entites): Change the meaning of the arg |
| 13152 | BEST-ONLY. Don't optimize for VEC of lenght 1. | 13152 | BEST-ONLY. Don't optimize for VEC of length 1. |
| 13153 | (font_select_entity): Just return the value of font_sort_entites. | 13153 | (font_select_entity): Just return the value of font_sort_entites. |
| 13154 | 13154 | ||
| 13155 | * xfaces.c (merge_face_vectors): Reflect font properties in | 13155 | * 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 @@ | |||
| 13137 | * print.c: Include dispextern.h. | 13137 | * print.c: Include dispextern.h. |
| 13138 | (printchar, strout): Use message_buf. | 13138 | (printchar, strout): Use message_buf. |
| 13139 | 13139 | ||
| 13140 | * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLenght. | 13140 | * sysdep.c (get_screen_size): Don't use MscreenWidth, MscreenLength. |
| 13141 | * term.c: Likewise. | 13141 | * term.c: Likewise. |
| 13142 | 13142 | ||
| 13143 | * scroll.c (CalcIDCosts, CalcIDCosts1, CalcLID): These now take a | 13143 | * scroll.c (CalcIDCosts, CalcIDCosts1, CalcLID): These now take a |
| @@ -13147,7 +13147,7 @@ | |||
| 13147 | (do_scrolling): Use alloca for queue. | 13147 | (do_scrolling): Use alloca for queue. |
| 13148 | 13148 | ||
| 13149 | * dispnew.c (remake_screen_structures): Allocate message_buf. | 13149 | * dispnew.c (remake_screen_structures): Allocate message_buf. |
| 13150 | Don't use MscreenWidth, MscreenLenght. | 13150 | Don't use MscreenWidth, MscreenLength. |
| 13151 | 13151 | ||
| 13152 | * xdisp.c: bf_cur replaced with current_buffer. | 13152 | * xdisp.c: bf_cur replaced with current_buffer. |
| 13153 | Calls to SetBfx deleted. | 13153 | 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; | |||
| 4439 | #define MMAP_ALLOCATED_P(start, end) 1 | 4439 | #define MMAP_ALLOCATED_P(start, end) 1 |
| 4440 | #endif | 4440 | #endif |
| 4441 | 4441 | ||
| 4442 | /* Perform necessary intializations for the use of mmap. */ | 4442 | /* Perform necessary initializations for the use of mmap. */ |
| 4443 | 4443 | ||
| 4444 | static void | 4444 | static void |
| 4445 | mmap_init (void) | 4445 | 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; | |||
| 978 | variable has an index > 0 associated with it, except when it always | 978 | variable has an index > 0 associated with it, except when it always |
| 979 | has buffer-local values, in which case the index is -1. If this is | 979 | has buffer-local values, in which case the index is -1. If this is |
| 980 | 0, this is a bug and means that the slot of VAR in | 980 | 0, this is a bug and means that the slot of VAR in |
| 981 | buffer_local_flags wasn't intiialized. */ | 981 | buffer_local_flags wasn't initialized. */ |
| 982 | 982 | ||
| 983 | #define PER_BUFFER_VAR_IDX(VAR) \ | 983 | #define PER_BUFFER_VAR_IDX(VAR) \ |
| 984 | PER_BUFFER_IDX (PER_BUFFER_VAR_OFFSET (VAR)) | 984 | 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'. */) | |||
| 747 | ARG is passed to C_FUNCTION when that is called. | 747 | ARG is passed to C_FUNCTION when that is called. |
| 748 | 748 | ||
| 749 | It returns the value of last character covered by TABLE (not the | 749 | It returns the value of last character covered by TABLE (not the |
| 750 | value inheritted from the parent), and by side-effect, the car part | 750 | value inherited from the parent), and by side-effect, the car part |
| 751 | of RANGE is updated to the minimum character C where C and all the | 751 | of RANGE is updated to the minimum character C where C and all the |
| 752 | following characters in TABLE have the same value. */ | 752 | following characters in TABLE have the same value. */ |
| 753 | 753 | ||
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/>. */ | |||
| 70 | #define IS_DRIVE(x) isalpha ((unsigned char) (x)) | 70 | #define IS_DRIVE(x) isalpha ((unsigned char) (x)) |
| 71 | #endif | 71 | #endif |
| 72 | /* Need to lower-case the drive letter, or else expanded | 72 | /* Need to lower-case the drive letter, or else expanded |
| 73 | filenames will sometimes compare inequal, because | 73 | filenames will sometimes compare unequal, because |
| 74 | `expand-file-name' doesn't always down-case the drive letter. */ | 74 | `expand-file-name' doesn't always down-case the drive letter. */ |
| 75 | #define DRIVE_LETTER(x) (tolower ((unsigned char) (x))) | 75 | #define DRIVE_LETTER(x) (tolower ((unsigned char) (x))) |
| 76 | #endif | 76 | #endif |
| @@ -3252,7 +3252,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string, | |||
| 3252 | return decoded_string; | 3252 | return decoded_string; |
| 3253 | } | 3253 | } |
| 3254 | 3254 | ||
| 3255 | /* Base64-decode the data at FROM of LENGHT bytes into TO. If | 3255 | /* Base64-decode the data at FROM of LENGTH bytes into TO. If |
| 3256 | MULTIBYTE is nonzero, the decoded result should be in multibyte | 3256 | MULTIBYTE is nonzero, the decoded result should be in multibyte |
| 3257 | form. If NCHARS_RETRUN is not NULL, store the number of produced | 3257 | form. If NCHARS_RETRUN is not NULL, store the number of produced |
| 3258 | characters in *NCHARS_RETURN. */ | 3258 | 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 | |||
| 55 | { | 55 | { |
| 56 | /* Background and foreground colors. */ | 56 | /* Background and foreground colors. */ |
| 57 | XColor colors[2]; | 57 | XColor colors[2]; |
| 58 | /* GCs interporationg the above colors. gcs[0] is for a color | 58 | /* GCs interpolating the above colors. gcs[0] is for a color |
| 59 | closest to BACKGROUND, and gcs[5] is for a color closest to | 59 | closest to BACKGROUND, and gcs[5] is for a color closest to |
| 60 | FOREGROUND. */ | 60 | FOREGROUND. */ |
| 61 | GC gcs[6]; | 61 | 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, | |||
| 7786 | goto imagemagick_error; | 7786 | goto imagemagick_error; |
| 7787 | } | 7787 | } |
| 7788 | 7788 | ||
| 7789 | /* Copy imagegmagick image to x with primitive yet robust pixel | 7789 | /* Copy imagemagick image to x with primitive yet robust pixel |
| 7790 | pusher loop. This has been tested a lot with many different | 7790 | pusher loop. This has been tested a lot with many different |
| 7791 | images. */ | 7791 | images. */ |
| 7792 | 7792 | ||
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) | |||
| 1900 | current buffer, and the invisible property has a `stickiness' such that | 1900 | current buffer, and the invisible property has a `stickiness' such that |
| 1901 | inserting a character at position POS would inherit the property it, | 1901 | inserting a character at position POS would inherit the property it, |
| 1902 | return POS + ADJ, otherwise return POS. If TEST_INTANG is non-zero, | 1902 | return POS + ADJ, otherwise return POS. If TEST_INTANG is non-zero, |
| 1903 | then intangibility is required as well as invisibleness. | 1903 | then intangibility is required as well as invisibility. |
| 1904 | 1904 | ||
| 1905 | TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1. | 1905 | TEST_OFFS should be either 0 or -1, and ADJ should be either 1 or -1. |
| 1906 | 1906 | ||
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. */) | |||
| 10137 | ! NILP (can_return_switch_frame), 0); | 10137 | ! NILP (can_return_switch_frame), 0); |
| 10138 | 10138 | ||
| 10139 | #if 0 /* The following is fine for code reading a key sequence and | 10139 | #if 0 /* The following is fine for code reading a key sequence and |
| 10140 | then proceeding with a lenghty computation, but it's not good | 10140 | then proceeding with a lengthy computation, but it's not good |
| 10141 | for code reading keys in a loop, like an input method. */ | 10141 | for code reading keys in a loop, like an input method. */ |
| 10142 | #ifdef HAVE_WINDOW_SYSTEM | 10142 | #ifdef HAVE_WINDOW_SYSTEM |
| 10143 | if (display_hourglass_p) | 10143 | 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 | |||
| 943 | 943 | ||
| 944 | /* Compute A OP B, using the unsigned comparison operator OP. A and B | 944 | /* Compute A OP B, using the unsigned comparison operator OP. A and B |
| 945 | should be integer expressions. This is not the same as | 945 | should be integer expressions. This is not the same as |
| 946 | mathemeatical comparison; for example, UNSIGNED_CMP (0, <, -1) | 946 | mathematical comparison; for example, UNSIGNED_CMP (0, <, -1) |
| 947 | returns 1. For efficiency, prefer plain unsigned comparison if A | 947 | returns 1. For efficiency, prefer plain unsigned comparison if A |
| 948 | and B's sizes both fit (after integer promotion). */ | 948 | and B's sizes both fit (after integer promotion). */ |
| 949 | #define UNSIGNED_CMP(a, op, b) \ | 949 | #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) | |||
| 3984 | Qnil = intern_c_string ("nil"); | 3984 | Qnil = intern_c_string ("nil"); |
| 3985 | 3985 | ||
| 3986 | /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil, | 3986 | /* Fmake_symbol inits fields of new symbols with Qunbound and Qnil, |
| 3987 | so those two need to be fixed manally. */ | 3987 | so those two need to be fixed manually. */ |
| 3988 | SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound); | 3988 | SET_SYMBOL_VAL (XSYMBOL (Qunbound), Qunbound); |
| 3989 | XSYMBOL (Qunbound)->function = Qunbound; | 3989 | XSYMBOL (Qunbound)->function = Qunbound; |
| 3990 | XSYMBOL (Qunbound)->plist = Qnil; | 3990 | 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 | |||
| 1342 | IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos) | 1342 | IT_copy_glyphs (int xfrom, int xto, size_t len, int ypos) |
| 1343 | { | 1343 | { |
| 1344 | /* The offsets of source and destination relative to the | 1344 | /* The offsets of source and destination relative to the |
| 1345 | conventional memorty selector. */ | 1345 | conventional memory selector. */ |
| 1346 | int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary; | 1346 | int from = 2 * (xfrom + screen_size_X * ypos) + ScreenPrimary; |
| 1347 | int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary; | 1347 | int to = 2 * (xto + screen_size_X * ypos) + ScreenPrimary; |
| 1348 | 1348 | ||
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 | |||
| 1635 | /* Detect circular list. */ | 1635 | /* Detect circular list. */ |
| 1636 | if (NILP (Vprint_circle)) | 1636 | if (NILP (Vprint_circle)) |
| 1637 | { | 1637 | { |
| 1638 | /* Simple but imcomplete way. */ | 1638 | /* Simple but incomplete way. */ |
| 1639 | if (i != 0 && EQ (obj, halftail)) | 1639 | if (i != 0 && EQ (obj, halftail)) |
| 1640 | { | 1640 | { |
| 1641 | sprintf (buf, " . #%"pMd, i / 2); | 1641 | 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, | |||
| 4506 | } | 4506 | } |
| 4507 | 4507 | ||
| 4508 | /* If window has been obscured or exposed by another window | 4508 | /* If window has been obscured or exposed by another window |
| 4509 | being maximised or minimised/restored, then recheck | 4509 | being maximized or minimized/restored, then recheck |
| 4510 | visibility of all frames. Direct changes to our own | 4510 | visibility of all frames. Direct changes to our own |
| 4511 | windows get handled by WM_SIZE. */ | 4511 | windows get handled by WM_SIZE. */ |
| 4512 | #if 0 | 4512 | #if 0 |
| @@ -5692,10 +5692,10 @@ x_make_frame_visible (struct frame *f) | |||
| 5692 | 5692 | ||
| 5693 | /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL | 5693 | /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL |
| 5694 | causes unexpected behavior when unminimizing frames that were | 5694 | causes unexpected behavior when unminimizing frames that were |
| 5695 | previously maximised. But only SW_SHOWNORMAL works properly for | 5695 | previously maximized. But only SW_SHOWNORMAL works properly for |
| 5696 | frames that were truely hidden (using make-frame-invisible), so | 5696 | frames that were truely hidden (using make-frame-invisible), so |
| 5697 | we need it to avoid Bug#5482. It seems that async_iconified | 5697 | we need it to avoid Bug#5482. It seems that async_iconified |
| 5698 | is only set for minimised windows that are still visible, so | 5698 | is only set for minimized windows that are still visible, so |
| 5699 | use that to determine the appropriate flag to pass ShowWindow. */ | 5699 | use that to determine the appropriate flag to pass ShowWindow. */ |
| 5700 | my_show_window (f, FRAME_W32_WINDOW (f), | 5700 | my_show_window (f, FRAME_W32_WINDOW (f), |
| 5701 | f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL); | 5701 | 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) | |||
| 15031 | int current_matrix_up_to_date_p = 0; | 15031 | int current_matrix_up_to_date_p = 0; |
| 15032 | int used_current_matrix_p = 0; | 15032 | int used_current_matrix_p = 0; |
| 15033 | /* This is less strict than current_matrix_up_to_date_p. | 15033 | /* This is less strict than current_matrix_up_to_date_p. |
| 15034 | It indictes that the buffer contents and narrowing are unchanged. */ | 15034 | It indicates that the buffer contents and narrowing are unchanged. */ |
| 15035 | int buffer_unchanged_p = 0; | 15035 | int buffer_unchanged_p = 0; |
| 15036 | int temp_scroll_step = 0; | 15036 | int temp_scroll_step = 0; |
| 15037 | int count = SPECPDL_INDEX (); | 15037 | 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) | |||
| 1304 | #ifdef USE_MOTIF | 1304 | #ifdef USE_MOTIF |
| 1305 | /* Removing the menu bar magically changes the shell widget's x | 1305 | /* Removing the menu bar magically changes the shell widget's x |
| 1306 | and y position of (0, 0) which, when the menu bar is turned | 1306 | and y position of (0, 0) which, when the menu bar is turned |
| 1307 | on again, leads to pull-down menuss appearing in strange | 1307 | on again, leads to pull-down menus appearing in strange |
| 1308 | positions near the upper-left corner of the display. This | 1308 | positions near the upper-left corner of the display. This |
| 1309 | happens only with some window managers like twm and ctwm, | 1309 | happens only with some window managers like twm and ctwm, |
| 1310 | but not with other like Motif's mwm or kwm, because the | 1310 | 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; | |||
| 4184 | 4184 | ||
| 4185 | /* Whether the drag scrolling maintains the mouse at the top of the | 4185 | /* Whether the drag scrolling maintains the mouse at the top of the |
| 4186 | thumb. If not, resizing the thumb needs to be done more carefully | 4186 | thumb. If not, resizing the thumb needs to be done more carefully |
| 4187 | to avoid jerkyness. */ | 4187 | to avoid jerkiness. */ |
| 4188 | 4188 | ||
| 4189 | static Boolean xaw3d_pick_top; | 4189 | static Boolean xaw3d_pick_top; |
| 4190 | 4190 | ||