diff options
| author | Chong Yidong | 2010-12-21 15:10:31 +0800 |
|---|---|---|
| committer | Chong Yidong | 2010-12-21 15:10:31 +0800 |
| commit | e14ad691966cd844eed62d4cb3793d0ecb07e45b (patch) | |
| tree | d8644242e746b0958d83cd62876b6168e64cf0e9 | |
| parent | d78cdcf74eab757f3f06826925df7835efad66dc (diff) | |
| download | emacs-e14ad691966cd844eed62d4cb3793d0ecb07e45b.tar.gz emacs-e14ad691966cd844eed62d4cb3793d0ecb07e45b.zip | |
Fix 2010-04-19 merge error in doc/emacs/maintaining.texi (Bug#7674).
| -rw-r--r-- | doc/emacs/maintaining.texi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index cf504b6be2a..8442586ab27 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi | |||
| @@ -2288,10 +2288,6 @@ details. | |||
| 2288 | You can also use the collection of tag names to complete a symbol | 2288 | You can also use the collection of tag names to complete a symbol |
| 2289 | name in the buffer. @xref{Symbol Completion}. | 2289 | name in the buffer. @xref{Symbol Completion}. |
| 2290 | 2290 | ||
| 2291 | @ifnottex | ||
| 2292 | @include emerge-xtra.texi | ||
| 2293 | @end ifnottex | ||
| 2294 | |||
| 2295 | @node EDE | 2291 | @node EDE |
| 2296 | @section Emacs Development Environment | 2292 | @section Emacs Development Environment |
| 2297 | @cindex EDE (Emacs Development Environment) | 2293 | @cindex EDE (Emacs Development Environment) |
| @@ -2355,6 +2351,10 @@ To build all the targets in the project, type @kbd{C-c . C} | |||
| 2355 | (@code{ede-compile-project}). EDE uses the file types to guess how | 2351 | (@code{ede-compile-project}). EDE uses the file types to guess how |
| 2356 | the target should be built. | 2352 | the target should be built. |
| 2357 | 2353 | ||
| 2354 | @ifnottex | ||
| 2355 | @include emerge-xtra.texi | ||
| 2356 | @end ifnottex | ||
| 2357 | |||
| 2358 | @ignore | 2358 | @ignore |
| 2359 | arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb | 2359 | arch-tag: b9d83dfb-82ea-4ff6-bab5-05a3617091fb |
| 2360 | @end ignore | 2360 | @end ignore |