diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /lib-src/make-docfile.c | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.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 9bc91bc4f77..73d1a0eb31d 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -555,7 +555,7 @@ enum global_type | |||
| 555 | LISP_OBJECT, | 555 | LISP_OBJECT, |
| 556 | EMACS_INTEGER, | 556 | EMACS_INTEGER, |
| 557 | BOOLEAN, | 557 | BOOLEAN, |
| 558 | FUNCTION, | 558 | FUNCTION |
| 559 | }; | 559 | }; |
| 560 | 560 | ||
| 561 | /* A single global. */ | 561 | /* A single global. */ |