diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-17 12:22:05 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-17 12:22:23 -0700 |
| commit | de9e1724a34a5ed7995655591e02816f70d19885 (patch) | |
| tree | 7fac822c4b428688845ba6ae8e405826812716c7 | |
| parent | 2f8935099c680f5e25afdf290d351180ee42fa39 (diff) | |
| download | emacs-de9e1724a34a5ed7995655591e02816f70d19885.tar.gz | |
; Spelling fixes
| -rw-r--r-- | doc/emacs/rmail.texi | 2 | ||||
| -rw-r--r-- | doc/misc/tramp.texi | 4 | ||||
| -rw-r--r-- | oldXMenu/Internal.c | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/emacs/rmail.texi b/doc/emacs/rmail.texi index b64ec223be7..99b7bc1dc50 100644 --- a/doc/emacs/rmail.texi +++ b/doc/emacs/rmail.texi @@ -1426,7 +1426,7 @@ Hostname of the remote server for remote mailboxes or file name of a local mailbox. @item port -Optional port number, if not the default for that protocal. +Optional port number, if not the default for that protocol. @end table @noindent diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 26b0915c0d9..e1d84457ff9 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -405,8 +405,8 @@ September 2011. Ad-hoc multi-hop methods (with a changed syntax) re-enabled in November 2011. In November 2012, added Juergen Hoetzel's @file{tramp-adb.el}. -XEmacs support has been stopped in January 2016. Since March 2017, -@value{tramp} syntax requires a method mandatorily. +XEmacs support was stopped in January 2016. Since March 2017, +@value{tramp} syntax mandates a method. @c Installation chapter is necessary only in case of standalone @c installation. Text taken from trampinst.texi. diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index aa9cf167f75..bc4ed223299 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c @@ -507,7 +507,7 @@ _XMRecomputeGlobals(register Display *display, register XMenu *menu) /* * Ensure that the origin of the menu is placed so that - * None of the panes ore selections are off the screen. + * None of the panes or selections are off the screen. */ screen = DefaultScreen(display); if (menu->x_pos + menu->width > DisplayWidth(display, screen)) diff --git a/src/xdisp.c b/src/xdisp.c index 7ff37a6fb48..82668494927 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -4999,7 +4999,7 @@ handle_single_display_spec (struct it *it, Lisp_Object spec, Lisp_Object object, { ptrdiff_t ovendpos = OVERLAY_POSITION (OVERLAY_END (overlay)); - /* Some borderly-sane Lisp might call us with the current + /* Some borderline-sane Lisp might call us with the current buffer narrowed so that overlay-end is outside the POINT_MIN..POINT_MAX region, which will then cause various assertion violations and crashes down the road, |