diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmds.c | 4 | ||||
| -rw-r--r-- | src/editfns.c | 4 | ||||
| -rw-r--r-- | src/frame.h | 2 | ||||
| -rw-r--r-- | src/regex-emacs.c | 2 | ||||
| -rw-r--r-- | src/xfaces.c | 10 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/cmds.c b/src/cmds.c index 462cb661d54..5d7a45e65f6 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -159,7 +159,7 @@ With argument N not nil or 1, move forward N - 1 lines first. If point reaches the beginning or end of buffer, it stops there. This function constrains point to the current field unless this moves -point to a different line than the original, unconstrained result. +point to a different line from the original, unconstrained result. If N is nil or 1, and a front-sticky field starts at point, the point does not move. To ignore field boundaries bind `inhibit-field-text-motion' to t, or use the `forward-line' function @@ -184,7 +184,7 @@ If point reaches the beginning or end of buffer, it stops there. To ignore intangibility, bind `inhibit-point-motion-hooks' to t. This function constrains point to the current field unless this moves -point to a different line than the original, unconstrained result. If +point to a different line from the original, unconstrained result. If N is nil or 1, and a rear-sticky field ends at point, the point does not move. To ignore field boundaries bind `inhibit-field-text-motion' to t. */) diff --git a/src/editfns.c b/src/editfns.c index 3f1b3aa4b75..05ad3925813 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -717,7 +717,7 @@ position of the first character in logical order, i.e. the smallest character position on the line. This function constrains the returned position to the current field -unless that position would be on a different line than the original, +unless that position would be on a different line from the original, unconstrained result. If N is nil or 1, and a front-sticky field starts at point, the scan stops as soon as it starts. To ignore field boundaries, bind `inhibit-field-text-motion' to t. @@ -750,7 +750,7 @@ position of the last character in logical order, i.e. the largest character position on the line. This function constrains the returned position to the current field -unless that would be on a different line than the original, +unless that would be on a different line from the original, unconstrained result. If N is nil or 1, and a rear-sticky field ends at point, the scan stops as soon as it starts. To ignore field boundaries bind `inhibit-field-text-motion' to t. diff --git a/src/frame.h b/src/frame.h index 6ab690c0ff5..a54b8623e50 100644 --- a/src/frame.h +++ b/src/frame.h @@ -107,7 +107,7 @@ struct frame to redirect keystrokes to a surrogate minibuffer frame when needed. - Note that a value of nil is different than having the field point + Note that a value of nil is different from having the field point to the frame itself. Whenever the Fselect_frame function is used to shift from one frame to the other, any redirections to the original frame are shifted to the newly selected frame; if diff --git a/src/regex-emacs.c b/src/regex-emacs.c index 552216cd87b..694431c95e2 100644 --- a/src/regex-emacs.c +++ b/src/regex-emacs.c @@ -3932,7 +3932,7 @@ re_match_2_internal (struct re_pattern_buffer *bufp, allocate space for that if we're not allocating space for anything else (see below). Also, we never need info about register 0 for any of the other register vectors, and it seems rather a kludge to - treat 'best_regend' differently than the rest. So we keep track of + treat 'best_regend' differently from the rest. So we keep track of the end of the best match so far in a separate variable. We initialize this to NULL so that when we backtrack the first time and need to test it, it's not garbage. */ diff --git a/src/xfaces.c b/src/xfaces.c index 3689b9ee7d3..91a7a8533e8 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4940,7 +4940,7 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector, that a face containing all the attributes in ATTRS, when merged with the default face for display, can be represented in a way that's - (1) different in appearance than the default face, and + (1) different in appearance from the default face, and (2) `close in spirit' to what the attributes specify, if not exact. */ static bool @@ -5043,7 +5043,7 @@ gui_supports_face_attributes_p (struct frame *f, that a face containing all the attributes in ATTRS, when merged with the default face for display, can be represented in a way that's - (1) different in appearance than the default face, and + (1) different in appearance from the default face, and (2) `close in spirit' to what the attributes specify, if not exact. Point (2) implies that a `:weight black' attribute will be satisfied @@ -5160,7 +5160,7 @@ tty_supports_face_attributes_p (struct frame *f, > TTY_SAME_COLOR_THRESHOLD) return false; /* displayed color is too different */ else - /* Make sure the color is really different than the default. */ + /* Make sure the color is really different from the default. */ { Emacs_Color def_fg_color; if (tty_lookup_color (f, def_fg, &def_fg_color, 0) @@ -5184,7 +5184,7 @@ tty_supports_face_attributes_p (struct frame *f, > TTY_SAME_COLOR_THRESHOLD) return false; /* displayed color is too different */ else - /* Make sure the color is really different than the default. */ + /* Make sure the color is really different from the default. */ { Emacs_Color def_bg_color; if (tty_lookup_color (f, def_bg, &def_bg_color, 0) @@ -5226,7 +5226,7 @@ The definition of `supported' is somewhat heuristic, but basically means that a face containing all the attributes in ATTRIBUTES, when merged with the default face for display, can be represented in a way that's - (1) different in appearance than the default face, and + (1) different in appearance from the default face, and (2) `close in spirit' to what the attributes specify, if not exact. Point (2) implies that a `:weight black' attribute will be satisfied by |