diff options
| author | Paul Eggert | 2011-12-11 21:32:49 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-11 21:32:49 -0800 |
| commit | 333f9019e29e9b6de3a7ec07448be1d364ba540b (patch) | |
| tree | fd19625604abbd2784e9c9de92c613ff965ea11d /src | |
| parent | 11636b221d2897aed5ca9a762d7b61afd20b6168 (diff) | |
| download | emacs-333f9019e29e9b6de3a7ec07448be1d364ba540b.tar.gz emacs-333f9019e29e9b6de3a7ec07448be1d364ba540b.zip | |
Spelling fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog.10 | 6 | ||||
| -rw-r--r-- | src/ChangeLog.2 | 6 | ||||
| -rw-r--r-- | src/alloc.c | 2 | ||||
| -rw-r--r-- | src/editfns.c | 2 | ||||
| -rw-r--r-- | src/emacs.c | 2 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/ftfont.c | 2 | ||||
| -rw-r--r-- | src/lastfile.c | 3 | ||||
| -rw-r--r-- | src/lread.c | 2 | ||||
| -rw-r--r-- | src/nsfont.m | 2 | ||||
| -rw-r--r-- | src/region-cache.c | 4 | ||||
| -rw-r--r-- | src/region-cache.h | 4 | ||||
| -rw-r--r-- | src/termhooks.h | 4 | ||||
| -rw-r--r-- | src/xfns.c | 8 |
14 files changed, 24 insertions, 25 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index e759183724e..53f7a016654 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 | |||
| @@ -15816,14 +15816,14 @@ | |||
| 15816 | Add prototypes. | 15816 | Add prototypes. |
| 15817 | 15817 | ||
| 15818 | * macterm.c (mac_draw_bitmap): Add overlay_p arg. | 15818 | * macterm.c (mac_draw_bitmap): Add overlay_p arg. |
| 15819 | (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps; | 15819 | (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps; |
| 15820 | thanks to YAMAMOTO Mitsuharu for advice on how to do this. | 15820 | thanks to YAMAMOTO Mitsuharu for advice on how to do this. |
| 15821 | Use cursor color for displaying cursor in fringe. | 15821 | Use cursor color for displaying cursor in fringe. |
| 15822 | (x_redisplay_interface): Add null handlers for | 15822 | (x_redisplay_interface): Add null handlers for |
| 15823 | define_fringe_bitmap and destroy_fringe_bitmap functions. | 15823 | define_fringe_bitmap and destroy_fringe_bitmap functions. |
| 15824 | 15824 | ||
| 15825 | * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from | 15825 | * w32term.c (w32_draw_fringe_bitmap): Copy unadapted code from |
| 15826 | xterm.c to handle overlayed fringe bitmaps and to use cursor color | 15826 | xterm.c to handle overlaid fringe bitmaps and to use cursor color |
| 15827 | for displaying cursor in fringe. | 15827 | for displaying cursor in fringe. |
| 15828 | (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 | 15828 | (w32_define_fringe_bitmap, w32_destroy_fringe_bitmap): New W32 |
| 15829 | specific functions to define and destroy fringe bitmaps in fringe_bmp. | 15829 | specific functions to define and destroy fringe bitmaps in fringe_bmp. |
| @@ -15849,7 +15849,7 @@ | |||
| 15849 | (display_line): Handle cursor in fringe at eob. | 15849 | (display_line): Handle cursor in fringe at eob. |
| 15850 | (display_line): Set row user fringe bitmaps from iterator. | 15850 | (display_line): Set row user fringe bitmaps from iterator. |
| 15851 | 15851 | ||
| 15852 | * xterm.c (x_draw_fringe_bitmap): Handle overlayed fringe bitmaps. | 15852 | * xterm.c (x_draw_fringe_bitmap): Handle overlaid fringe bitmaps. |
| 15853 | Use cursor color for displaying cursor in fringe. | 15853 | Use cursor color for displaying cursor in fringe. |
| 15854 | (x_redisplay_interface): Add null handlers for | 15854 | (x_redisplay_interface): Add null handlers for |
| 15855 | define_fringe_bitmap and destroy_fringe_bitmap functions. | 15855 | define_fringe_bitmap and destroy_fringe_bitmap functions. |
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ba61c337efc..d3be0064610 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -2254,7 +2254,7 @@ | |||
| 2254 | Initialize save_color. | 2254 | Initialize save_color. |
| 2255 | 2255 | ||
| 2256 | * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: | 2256 | * fileio.c, search.c, sysdep.c, filelock.c, editfns.c, process.c: |
| 2257 | Delete/replace unused/conditionalised variables | 2257 | Delete/replace unused/conditionalized variables |
| 2258 | 2258 | ||
| 2259 | 1987-01-15 Richard M. Stallman (rms@prep) | 2259 | 1987-01-15 Richard M. Stallman (rms@prep) |
| 2260 | 2260 | ||
| @@ -2632,7 +2632,7 @@ | |||
| 2632 | * fns.c: Fding requires an arg; pass Qnil. | 2632 | * fns.c: Fding requires an arg; pass Qnil. |
| 2633 | 2633 | ||
| 2634 | * m-alliant.h: define TEXT_START as 0x1000. | 2634 | * m-alliant.h: define TEXT_START as 0x1000. |
| 2635 | Don't define LIBS_STANDARD; the default (sharable) library | 2635 | Don't define LIBS_STANDARD; the default (shareable) library |
| 2636 | is said to work now. | 2636 | is said to work now. |
| 2637 | 2637 | ||
| 2638 | * alloc.c (mark_object): Now pass address of slot being marked. | 2638 | * alloc.c (mark_object): Now pass address of slot being marked. |
| @@ -4220,7 +4220,7 @@ | |||
| 4220 | Increase PURESIZE again (sigh) | 4220 | Increase PURESIZE again (sigh) |
| 4221 | 4221 | ||
| 4222 | * unexec.c (write_segment): | 4222 | * unexec.c (write_segment): |
| 4223 | Kludgey coercions ("(int)") to get this line to compile: | 4223 | Kludgy coercions ("(int)") to get this line to compile: |
| 4224 | nwrite = (((int) ptr + 128) & ~127) - (int) ptr; | 4224 | nwrite = (((int) ptr + 128) & ~127) - (int) ptr; |
| 4225 | Also changed incorrect ~128 to ~127. | 4225 | Also changed incorrect ~128 to ~127. |
| 4226 | 4226 | ||
diff --git a/src/alloc.c b/src/alloc.c index 96d63f53cf9..6f70976c345 100644 --- a/src/alloc.c +++ b/src/alloc.c | |||
| @@ -6399,7 +6399,7 @@ If this portion is smaller than `gc-cons-threshold', this is ignored. */); | |||
| 6399 | Vgc_cons_percentage = make_float (0.1); | 6399 | Vgc_cons_percentage = make_float (0.1); |
| 6400 | 6400 | ||
| 6401 | DEFVAR_INT ("pure-bytes-used", pure_bytes_used, | 6401 | DEFVAR_INT ("pure-bytes-used", pure_bytes_used, |
| 6402 | doc: /* Number of bytes of sharable Lisp data allocated so far. */); | 6402 | doc: /* Number of bytes of shareable Lisp data allocated so far. */); |
| 6403 | 6403 | ||
| 6404 | DEFVAR_INT ("cons-cells-consed", cons_cells_consed, | 6404 | DEFVAR_INT ("cons-cells-consed", cons_cells_consed, |
| 6405 | doc: /* Number of cons cells that have been consed so far. */); | 6405 | doc: /* Number of cons cells that have been consed so far. */); |
diff --git a/src/editfns.c b/src/editfns.c index 83cd4bd5535..7077f40e51c 100644 --- a/src/editfns.c +++ b/src/editfns.c | |||
| @@ -3870,7 +3870,7 @@ usage: (format STRING &rest OBJECTS) */) | |||
| 3870 | enum | 3870 | enum |
| 3871 | { | 3871 | { |
| 3872 | /* Maximum precision for a %f conversion such that the | 3872 | /* Maximum precision for a %f conversion such that the |
| 3873 | trailing output digit might be nonzero. Any precisions | 3873 | trailing output digit might be nonzero. Any precision |
| 3874 | larger than this will not yield useful information. */ | 3874 | larger than this will not yield useful information. */ |
| 3875 | USEFUL_PRECISION_MAX = | 3875 | USEFUL_PRECISION_MAX = |
| 3876 | ((1 - DBL_MIN_EXP) | 3876 | ((1 - DBL_MIN_EXP) |
diff --git a/src/emacs.c b/src/emacs.c index 6bfc0dc60d0..12a48b26553 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -951,7 +951,7 @@ main (int argc, char **argv) | |||
| 951 | } | 951 | } |
| 952 | 952 | ||
| 953 | /* Command line option --no-windows is deprecated and thus not mentioned | 953 | /* Command line option --no-windows is deprecated and thus not mentioned |
| 954 | in the manual and usage informations. */ | 954 | in the manual and usage information. */ |
| 955 | if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) | 955 | if (argmatch (argv, argc, "-nw", "--no-window-system", 6, NULL, &skip_args) |
| 956 | || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) | 956 | || argmatch (argv, argc, "-nw", "--no-windows", 6, NULL, &skip_args)) |
| 957 | inhibit_window_system = 1; | 957 | inhibit_window_system = 1; |
diff --git a/src/fontset.c b/src/fontset.c index 605d807aa3c..281ac92f82d 100644 --- a/src/fontset.c +++ b/src/fontset.c | |||
| @@ -643,7 +643,7 @@ fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fa | |||
| 643 | if (font_has_char (f, font_object, c)) | 643 | if (font_has_char (f, font_object, c)) |
| 644 | goto found; | 644 | goto found; |
| 645 | 645 | ||
| 646 | /* Find a font already opened, maching with the current spec, | 646 | /* Find a font already opened, matching with the current spec, |
| 647 | and supporting C. */ | 647 | and supporting C. */ |
| 648 | font_def = RFONT_DEF_FONT_DEF (rfont_def); | 648 | font_def = RFONT_DEF_FONT_DEF (rfont_def); |
| 649 | for (; found_index + 1 < ASIZE (vec); found_index++) | 649 | for (; found_index + 1 < ASIZE (vec); found_index++) |
diff --git a/src/ftfont.c b/src/ftfont.c index bab97e44fab..dbb2ce2745e 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -960,7 +960,7 @@ ftfont_list (Lisp_Object frame, Lisp_Object spec) | |||
| 960 | /* Need fix because this finds any fonts. */ | 960 | /* Need fix because this finds any fonts. */ |
| 961 | if (fontset->nfont == 0 && ! NILP (family)) | 961 | if (fontset->nfont == 0 && ! NILP (family)) |
| 962 | { | 962 | { |
| 963 | /* Try maching with configuration. For instance, the | 963 | /* Try matching with configuration. For instance, the |
| 964 | configuration may specify "Nimbus Mono L" as an alias of | 964 | configuration may specify "Nimbus Mono L" as an alias of |
| 965 | "Courier". */ | 965 | "Courier". */ |
| 966 | FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, | 966 | FcPattern *pat = FcPatternBuild (0, FC_FAMILY, FcTypeString, |
diff --git a/src/lastfile.c b/src/lastfile.c index d348e4ebb07..ab07e748930 100644 --- a/src/lastfile.c +++ b/src/lastfile.c | |||
| @@ -23,7 +23,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 23 | 23 | ||
| 24 | The files of Emacs are written so as to have no initialized | 24 | The files of Emacs are written so as to have no initialized |
| 25 | data that can ever need to be altered except at the first startup. | 25 | data that can ever need to be altered except at the first startup. |
| 26 | This is so that those words can be dumped as sharable text. | 26 | This is so that those words can be dumped as shareable text. |
| 27 | 27 | ||
| 28 | It is not possible to exercise such control over library files. | 28 | It is not possible to exercise such control over library files. |
| 29 | So it is necessary to refrain from making their data areas shared. | 29 | So it is necessary to refrain from making their data areas shared. |
| @@ -47,4 +47,3 @@ char my_endbss[1]; | |||
| 47 | of the bss area used by Emacs. */ | 47 | of the bss area used by Emacs. */ |
| 48 | static char _my_endbss[1]; | 48 | static char _my_endbss[1]; |
| 49 | char * my_endbss_static = _my_endbss; | 49 | char * my_endbss_static = _my_endbss; |
| 50 | |||
diff --git a/src/lread.c b/src/lread.c index 582d8f46638..7c0b0475786 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -2822,7 +2822,7 @@ read1 (register Lisp_Object readcharfun, int *pch, int first_in_list) | |||
| 2822 | So we now use the same heuristic as for backquote: old-style | 2822 | So we now use the same heuristic as for backquote: old-style |
| 2823 | unquotes are only recognized when first on a list, and when | 2823 | unquotes are only recognized when first on a list, and when |
| 2824 | followed by a space. | 2824 | followed by a space. |
| 2825 | Because it's more difficult to peak 2 chars ahead, a new-style | 2825 | Because it's more difficult to peek 2 chars ahead, a new-style |
| 2826 | ,@ can still not be used outside of a `, unless it's in the middle | 2826 | ,@ can still not be used outside of a `, unless it's in the middle |
| 2827 | of a list. */ | 2827 | of a list. */ |
| 2828 | if (new_backquote_flag | 2828 | if (new_backquote_flag |
diff --git a/src/nsfont.m b/src/nsfont.m index 7d691ced6e1..6a053af344d 100644 --- a/src/nsfont.m +++ b/src/nsfont.m | |||
| @@ -630,7 +630,7 @@ nsfont_list (Lisp_Object frame, Lisp_Object font_spec) | |||
| 630 | } | 630 | } |
| 631 | 631 | ||
| 632 | 632 | ||
| 633 | /* Return a font entity most closely maching with FONT_SPEC on | 633 | /* Return a font entity most closely matching with FONT_SPEC on |
| 634 | FRAME. The closeness is determined by the font backend, thus | 634 | FRAME. The closeness is determined by the font backend, thus |
| 635 | `face-font-selection-order' is ignored here. | 635 | `face-font-selection-order' is ignored here. |
| 636 | Properties to be considered are same as for list(). */ | 636 | Properties to be considered are same as for list(). */ |
diff --git a/src/region-cache.c b/src/region-cache.c index ed7a07a6709..054374eb688 100644 --- a/src/region-cache.c +++ b/src/region-cache.c | |||
| @@ -699,7 +699,7 @@ know_region_cache (struct buffer *buf, struct region_cache *c, | |||
| 699 | 699 | ||
| 700 | /* Return true if the text immediately after POS in BUF is known, for | 700 | /* Return true if the text immediately after POS in BUF is known, for |
| 701 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 701 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 702 | position after POS where the knownness changes. */ | 702 | position after POS where the knowledge changes. */ |
| 703 | int | 703 | int |
| 704 | region_cache_forward (struct buffer *buf, struct region_cache *c, | 704 | region_cache_forward (struct buffer *buf, struct region_cache *c, |
| 705 | ptrdiff_t pos, ptrdiff_t *next) | 705 | ptrdiff_t pos, ptrdiff_t *next) |
| @@ -736,7 +736,7 @@ region_cache_forward (struct buffer *buf, struct region_cache *c, | |||
| 736 | 736 | ||
| 737 | /* Return true if the text immediately before POS in BUF is known, for | 737 | /* Return true if the text immediately before POS in BUF is known, for |
| 738 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 738 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 739 | position before POS where the knownness changes. */ | 739 | position before POS where the knowledge changes. */ |
| 740 | int region_cache_backward (struct buffer *buf, struct region_cache *c, | 740 | int region_cache_backward (struct buffer *buf, struct region_cache *c, |
| 741 | ptrdiff_t pos, ptrdiff_t *next) | 741 | ptrdiff_t pos, ptrdiff_t *next) |
| 742 | { | 742 | { |
diff --git a/src/region-cache.h b/src/region-cache.h index 8e1be716776..6758f8bcd08 100644 --- a/src/region-cache.h +++ b/src/region-cache.h | |||
| @@ -97,7 +97,7 @@ extern void invalidate_region_cache (struct buffer *BUF, | |||
| 97 | 97 | ||
| 98 | /* Return true if the text immediately after POS in BUF is known, for | 98 | /* Return true if the text immediately after POS in BUF is known, for |
| 99 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 99 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 100 | position after POS where the knownness changes. */ | 100 | position after POS where the knowledge changes. */ |
| 101 | extern int region_cache_forward (struct buffer *BUF, | 101 | extern int region_cache_forward (struct buffer *BUF, |
| 102 | struct region_cache *CACHE, | 102 | struct region_cache *CACHE, |
| 103 | ptrdiff_t POS, | 103 | ptrdiff_t POS, |
| @@ -105,7 +105,7 @@ extern int region_cache_forward (struct buffer *BUF, | |||
| 105 | 105 | ||
| 106 | /* Return true if the text immediately before POS in BUF is known, for | 106 | /* Return true if the text immediately before POS in BUF is known, for |
| 107 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest | 107 | the purposes of CACHE. If NEXT is non-zero, set *NEXT to the nearest |
| 108 | position before POS where the knownness changes. */ | 108 | position before POS where the knowledge changes. */ |
| 109 | extern int region_cache_backward (struct buffer *BUF, | 109 | extern int region_cache_backward (struct buffer *BUF, |
| 110 | struct region_cache *CACHE, | 110 | struct region_cache *CACHE, |
| 111 | ptrdiff_t POS, | 111 | ptrdiff_t POS, |
diff --git a/src/termhooks.h b/src/termhooks.h index 63d166b6418..5bd081d6d8b 100644 --- a/src/termhooks.h +++ b/src/termhooks.h | |||
| @@ -553,7 +553,7 @@ struct terminal | |||
| 553 | 553 | ||
| 554 | /* Arrange for all scroll bars on FRAME to be removed at the next call | 554 | /* Arrange for all scroll bars on FRAME to be removed at the next call |
| 555 | to `*judge_scroll_bars_hook'. A scroll bar may be spared if | 555 | to `*judge_scroll_bars_hook'. A scroll bar may be spared if |
| 556 | `*redeem_scroll_bar_hook' is applied to its window before the judgement. | 556 | `*redeem_scroll_bar_hook' is applied to its window before the judgment. |
| 557 | 557 | ||
| 558 | This should be applied to each frame each time its window tree is | 558 | This should be applied to each frame each time its window tree is |
| 559 | redisplayed, even if it is not displaying scroll bars at the moment; | 559 | redisplayed, even if it is not displaying scroll bars at the moment; |
| @@ -565,7 +565,7 @@ struct terminal | |||
| 565 | currently displaying them. */ | 565 | currently displaying them. */ |
| 566 | void (*condemn_scroll_bars_hook) (struct frame *frame); | 566 | void (*condemn_scroll_bars_hook) (struct frame *frame); |
| 567 | 567 | ||
| 568 | /* Unmark WINDOW's scroll bar for deletion in this judgement cycle. | 568 | /* Unmark WINDOW's scroll bar for deletion in this judgment cycle. |
| 569 | Note that it's okay to redeem a scroll bar that is not condemned. */ | 569 | Note that it's okay to redeem a scroll bar that is not condemned. */ |
| 570 | void (*redeem_scroll_bar_hook) (struct window *window); | 570 | void (*redeem_scroll_bar_hook) (struct window *window); |
| 571 | 571 | ||
diff --git a/src/xfns.c b/src/xfns.c index 95154395e9c..e44f28df870 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1877,7 +1877,7 @@ static XIMStyle supported_xim_styles[] = | |||
| 1877 | #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT | 1877 | #if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT |
| 1878 | /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ | 1878 | /* Create an X fontset on frame F with base font name BASE_FONTNAME. */ |
| 1879 | 1879 | ||
| 1880 | static const char xic_defaut_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; | 1880 | static const char xic_default_fontset[] = "-*-*-*-r-normal--14-*-*-*-*-*-*-*"; |
| 1881 | 1881 | ||
| 1882 | /* Create an Xt fontset spec from the name of a base font. | 1882 | /* Create an Xt fontset spec from the name of a base font. |
| 1883 | If `motif' is True use the Motif syntax. */ | 1883 | If `motif' is True use the Motif syntax. */ |
| @@ -1888,7 +1888,7 @@ xic_create_fontsetname (const char *base_fontname, int motif) | |||
| 1888 | char *fontsetname; | 1888 | char *fontsetname; |
| 1889 | 1889 | ||
| 1890 | /* Make a fontset name from the base font name. */ | 1890 | /* Make a fontset name from the base font name. */ |
| 1891 | if (xic_defaut_fontset == base_fontname) | 1891 | if (xic_default_fontset == base_fontname) |
| 1892 | { /* There is no base font name, use the default. */ | 1892 | { /* There is no base font name, use the default. */ |
| 1893 | ptrdiff_t len = strlen (base_fontname) + 2; | 1893 | ptrdiff_t len = strlen (base_fontname) + 2; |
| 1894 | fontsetname = xmalloc (len); | 1894 | fontsetname = xmalloc (len); |
| @@ -1912,12 +1912,12 @@ xic_create_fontsetname (const char *base_fontname, int motif) | |||
| 1912 | modify it to generalize it to allcs and allfamilies. | 1912 | modify it to generalize it to allcs and allfamilies. |
| 1913 | Use the specified font plus the default. */ | 1913 | Use the specified font plus the default. */ |
| 1914 | ptrdiff_t len = | 1914 | ptrdiff_t len = |
| 1915 | strlen (base_fontname) + strlen (xic_defaut_fontset) + 3; | 1915 | strlen (base_fontname) + strlen (xic_default_fontset) + 3; |
| 1916 | fontsetname = xmalloc (len); | 1916 | fontsetname = xmalloc (len); |
| 1917 | memset (fontsetname, 0, len); | 1917 | memset (fontsetname, 0, len); |
| 1918 | strcpy (fontsetname, base_fontname); | 1918 | strcpy (fontsetname, base_fontname); |
| 1919 | strcat (fontsetname, sep); | 1919 | strcat (fontsetname, sep); |
| 1920 | strcat (fontsetname, xic_defaut_fontset); | 1920 | strcat (fontsetname, xic_default_fontset); |
| 1921 | } | 1921 | } |
| 1922 | else | 1922 | else |
| 1923 | { | 1923 | { |