diff options
| author | Paul Eggert | 2012-10-31 12:23:06 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-10-31 12:23:06 -0700 |
| commit | 5c6ce1c7d035ad412e9bdec6cf385c06ffd5680e (patch) | |
| tree | 89d38a3730a42e95937460717f72f248a708047e | |
| parent | 322aea6ddf7ec7fd71410d98ec1de69f219aff3e (diff) | |
| download | emacs-5c6ce1c7d035ad412e9bdec6cf385c06ffd5680e.tar.gz emacs-5c6ce1c7d035ad412e9bdec6cf385c06ffd5680e.zip | |
Spelling fixes.
| -rw-r--r-- | doc/lispref/loading.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/variables.texi | 2 | ||||
| -rw-r--r-- | doc/misc/cl.texi | 3 | ||||
| -rw-r--r-- | src/w32proc.c | 2 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 6a18bea2977..79fd352adfb 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi | |||
| @@ -615,7 +615,7 @@ specified by an autoload object: | |||
| 615 | 615 | ||
| 616 | @defun autoload-do-load autoload &optional name macro-only | 616 | @defun autoload-do-load autoload &optional name macro-only |
| 617 | This function performs the loading specified by @var{autoload}, which | 617 | This function performs the loading specified by @var{autoload}, which |
| 618 | whould be an autoload object. The optional argument @var{name}, if | 618 | should be an autoload object. The optional argument @var{name}, if |
| 619 | non-@code{nil}, should be a symbol whose function value is | 619 | non-@code{nil}, should be a symbol whose function value is |
| 620 | @var{autoload}; in that case, the return value of this function is the | 620 | @var{autoload}; in that case, the return value of this function is the |
| 621 | symbol's new function value. If the value of the optional argument | 621 | symbol's new function value. If the value of the optional argument |
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 580dd8258df..88b7909126e 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi | |||
| @@ -2033,7 +2033,7 @@ itself be a valid @var{place} form. For example, @code{(setf (nthcdr | |||
| 2033 | @c to standard Common Lisp. | 2033 | @c to standard Common Lisp. |
| 2034 | 2034 | ||
| 2035 | @c FIXME I don't think is a particularly good way to do it, | 2035 | @c FIXME I don't think is a particularly good way to do it, |
| 2036 | @c but these macros are introduced before gvs are. | 2036 | @c but these macros are introduced before generalized variables are. |
| 2037 | The macros @code{push} (@pxref{List Variables}) and @code{pop} | 2037 | The macros @code{push} (@pxref{List Variables}) and @code{pop} |
| 2038 | (@pxref{List Elements}) can manipulate generalized variables, | 2038 | (@pxref{List Elements}) can manipulate generalized variables, |
| 2039 | not just lists. @code{(pop @var{place})} removes and returns the first | 2039 | not just lists. @code{(pop @var{place})} removes and returns the first |
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index d01798497da..10735420534 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi | |||
| @@ -991,7 +991,7 @@ has been made. @xref{Obsolete Setf Customization}. | |||
| 991 | 991 | ||
| 992 | @c FIXME should this be in lispref? It seems self-evident. | 992 | @c FIXME should this be in lispref? It seems self-evident. |
| 993 | @c Contrast with the cl-incf example later on. | 993 | @c Contrast with the cl-incf example later on. |
| 994 | @c Here it really only serves as a constrast to wrong-order. | 994 | @c Here it really only serves as a contrast to wrong-order. |
| 995 | The @code{setf} macro takes care to evaluate all subforms in | 995 | The @code{setf} macro takes care to evaluate all subforms in |
| 996 | the proper left-to-right order; for example, | 996 | the proper left-to-right order; for example, |
| 997 | 997 | ||
| @@ -5129,4 +5129,3 @@ defined later. | |||
| 5129 | @printindex vr | 5129 | @printindex vr |
| 5130 | 5130 | ||
| 5131 | @bye | 5131 | @bye |
| 5132 | |||
diff --git a/src/w32proc.c b/src/w32proc.c index d45d9879a24..a0ff96e593c 100644 --- a/src/w32proc.c +++ b/src/w32proc.c | |||
| @@ -519,7 +519,7 @@ term_timers (void) | |||
| 519 | void | 519 | void |
| 520 | init_timers (void) | 520 | init_timers (void) |
| 521 | { | 521 | { |
| 522 | /* GetThreadTimes is not avaiulable on all versions of Windows, so | 522 | /* GetThreadTimes is not available on all versions of Windows, so |
| 523 | need to probe for its availability dynamically, and call it | 523 | need to probe for its availability dynamically, and call it |
| 524 | through a pointer. */ | 524 | through a pointer. */ |
| 525 | s_pfn_Get_Thread_Times = NULL; /* in case dumped Emacs comes with a value */ | 525 | s_pfn_Get_Thread_Times = NULL; /* in case dumped Emacs comes with a value */ |
diff --git a/src/xterm.c b/src/xterm.c index 8b005873f4d..f8420d13a32 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -3448,7 +3448,7 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra | |||
| 3448 | 3448 | ||
| 3449 | /* Don't stop displaying the initial startup message | 3449 | /* Don't stop displaying the initial startup message |
| 3450 | for a switch-frame event we don't need. */ | 3450 | for a switch-frame event we don't need. */ |
| 3451 | /* When run as a deamon, Vterminal_frame is always NIL. */ | 3451 | /* When run as a daemon, Vterminal_frame is always NIL. */ |
| 3452 | if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt)) | 3452 | if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt)) |
| 3453 | && CONSP (Vframe_list) | 3453 | && CONSP (Vframe_list) |
| 3454 | && !NILP (XCDR (Vframe_list))) | 3454 | && !NILP (XCDR (Vframe_list))) |