diff options
| author | Joakim Verona | 2012-05-21 00:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-05-21 00:37:29 +0200 |
| commit | 74f082445c1dd0c92d5bb187db0d50287e3a7bae (patch) | |
| tree | 48e3d8fd9df3876665654eab9bcf96ec492a31e9 /lib-src/make-docfile.c | |
| parent | 52862ad482e030e4d54cd7d6e250d76e59ee0554 (diff) | |
| parent | 1b170bc63c2f3a3fbe6ba6996d5a015e82634909 (diff) | |
| download | emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.tar.gz emacs-74f082445c1dd0c92d5bb187db0d50287e3a7bae.zip | |
upstream, fix conflicts
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 3e79cae4f41..b33b13f34ce 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c | |||
| @@ -1361,7 +1361,7 @@ scan_lisp_file (const char *filename, const char *mode) | |||
| 1361 | #ifdef DEBUG | 1361 | #ifdef DEBUG |
| 1362 | else if (! strcmp (buffer, "if") | 1362 | else if (! strcmp (buffer, "if") |
| 1363 | || ! strcmp (buffer, "byte-code")) | 1363 | || ! strcmp (buffer, "byte-code")) |
| 1364 | ; | 1364 | continue; |
| 1365 | #endif | 1365 | #endif |
| 1366 | 1366 | ||
| 1367 | else | 1367 | else |