diff options
| author | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-01-22 15:40:56 -0500 |
| commit | cf206f28eb11467aed7f5e03f3e4df7724fd98d2 (patch) | |
| tree | 2f5695e6a774a918874b82c286f140abd052d860 /lib-src | |
| parent | 5a876cd5f810b611f78dd4cf7a1673bffeea19a9 (diff) | |
| parent | c893016b07f33eb8d56e1011245fe59a67cb4ee0 (diff) | |
| download | emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.tar.gz emacs-cf206f28eb11467aed7f5e03f3e4df7724fd98d2.zip | |
Merge from mainline.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/make-docfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index af1928c63fb..eb15342ca5b 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -240,10 +240,10 @@ struct rcsoc_state | |||
| 240 | /* A keyword we look for at the beginning of lines. If found, it is | 240 | /* A keyword we look for at the beginning of lines. If found, it is |
| 241 | not copied, and SAW_KEYWORD is set to true. */ | 241 | not copied, and SAW_KEYWORD is set to true. */ |
| 242 | char *keyword; | 242 | char *keyword; |
| 243 | /* The current point we've reached in an occurance of KEYWORD in | 243 | /* The current point we've reached in an occurrence of KEYWORD in |
| 244 | the input stream. */ | 244 | the input stream. */ |
| 245 | char *cur_keyword_ptr; | 245 | char *cur_keyword_ptr; |
| 246 | /* Set to true if we saw an occurance of KEYWORD. */ | 246 | /* Set to true if we saw an occurrence of KEYWORD. */ |
| 247 | int saw_keyword; | 247 | int saw_keyword; |
| 248 | }; | 248 | }; |
| 249 | 249 | ||
| @@ -354,7 +354,7 @@ scan_keyword_or_put_char (ch, state) | |||
| 354 | PRINTFLAG is positive, output string contents to outfile. If it is | 354 | PRINTFLAG is positive, output string contents to outfile. If it is |
| 355 | negative, store contents in buf. Convert escape sequences \n and | 355 | negative, store contents in buf. Convert escape sequences \n and |
| 356 | \t to newline and tab; discard \ followed by newline. | 356 | \t to newline and tab; discard \ followed by newline. |
| 357 | If SAW_USAGE is non-zero, then any occurances of the string `usage:' | 357 | If SAW_USAGE is non-zero, then any occurrences of the string `usage:' |
| 358 | at the beginning of a line will be removed, and *SAW_USAGE set to | 358 | at the beginning of a line will be removed, and *SAW_USAGE set to |
| 359 | true if any were encountered. */ | 359 | true if any were encountered. */ |
| 360 | 360 | ||