diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ccl.c | 2 | ||||
| -rw-r--r-- | src/font.c | 2 | ||||
| -rw-r--r-- | src/fontset.c | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 2 | ||||
| -rw-r--r-- | src/nsfns.m | 4 | ||||
| -rw-r--r-- | src/w32term.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/ccl.c b/src/ccl.c index 01943eddf58..83192d9d737 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -1762,7 +1762,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size case CCL_STAT_QUIT: if (! ccl->quit_silently) - sprintf (msg, "\nCCL: Quited."); + sprintf (msg, "\nCCL: Quitted."); break; default: diff --git a/src/font.c b/src/font.c index f6723157de1..ead8225471e 100644 --- a/src/font.c +++ b/src/font.c @@ -802,7 +802,7 @@ font_expand_wildcards (Lisp_Object *field, int n) struct { /* Minimum possible field. */ int from; - /* Maxinum possible field. */ + /* Maximum possible field. */ int to; /* Bit mask of possible field. Nth bit corresponds to Nth field. */ int mask; diff --git a/src/fontset.c b/src/fontset.c index 74a25a1ca04..5c9ebf8440a 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1788,7 +1788,7 @@ update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) /* Return a cons (FONT-OBJECT . GLYPH-CODE). FONT-OBJECT is the font for the character at POSITION in the current buffer. This is computed from all the text properties and overlays - that apply to POSITION. POSTION may be nil, in which case, + that apply to POSITION. POSITION may be nil, in which case, FONT-SPEC is the font for displaying the character CH with the default face. diff --git a/src/keyboard.c b/src/keyboard.c index f8c31af3fbe..fb989d3ea95 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8782,7 +8782,7 @@ typedef struct keyremap /* Positions [START, END) in the key sequence buffer are the key that we have scanned so far. Those events are the ones that we will replace - if PAREHT maps them into a key sequence. */ + if PARENT maps them into a key sequence. */ int start, end; } keyremap; diff --git a/src/nsfns.m b/src/nsfns.m index 20b021c6f5d..bcf14fe6105 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -1267,7 +1267,7 @@ This function is an internal primitive--use `make-frame' instead. */) #endif init_frame_faces (f); - + /* The resources controlling the menu-bar and tool-bar are processed specially at startup, and reflected in the mode variables; ignore them here. */ @@ -1656,7 +1656,7 @@ If omitted or nil, the selected frame's display is used. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Return whether the Nexstep display DISPLAY supports backing store. + doc: /* Return whether the Nextstep display DISPLAY supports backing store. The value may be `buffered', `retained', or `non-retained'. DISPLAY should be a frame, the display name as a string, or a terminal ID. If omitted or nil, the selected frame's display is used. */) diff --git a/src/w32term.c b/src/w32term.c index f876cff0363..e2a06446976 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3287,7 +3287,7 @@ w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, /* Handle mouse button event on the tool-bar of frame F, at frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress - or ButtonRelase. */ + or ButtonRelease. */ static void w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) diff --git a/src/xdisp.c b/src/xdisp.c index dfb794f38d3..efe7a6c9d00 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -22049,7 +22049,7 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph, /* Get glyph code of character C in FONT in the two-byte form CHAR2B. - Retunr 1 if FONT has a glyph for C, otherwise return 0. */ + Return 1 if FONT has a glyph for C, otherwise return 0. */ static inline int get_char_glyph_code (int c, struct font *font, XChar2b *char2b) diff --git a/src/xfns.c b/src/xfns.c index 2359a1a82c2..6de412c4e68 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3691,7 +3691,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, doc: /* Return the "vendor ID" string of the X server of display TERMINAL. -\(Labelling every distributor as a "vendor" embodies the false assumption +\(Labeling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). |