diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /lib-src/make-docfile.c | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
Diffstat (limited to 'lib-src/make-docfile.c')
| -rw-r--r-- | lib-src/make-docfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index 8fa70dd430e..9bc91bc4f77 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -276,7 +276,7 @@ struct rcsoc_state | |||
| 276 | /* Output CH to the file or buffer in STATE. Any pending newlines or | 276 | /* Output CH to the file or buffer in STATE. Any pending newlines or |
| 277 | spaces are output first. */ | 277 | spaces are output first. */ |
| 278 | 278 | ||
| 279 | static inline void | 279 | static void |
| 280 | put_char (int ch, struct rcsoc_state *state) | 280 | put_char (int ch, struct rcsoc_state *state) |
| 281 | { | 281 | { |
| 282 | int out_ch; | 282 | int out_ch; |