diff options
| author | Miles Bader | 2006-10-15 02:54:13 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-10-15 02:54:13 +0000 |
| commit | bb9c4b4f8b3dcd1b5fc96d2d0275cc532832fbd6 (patch) | |
| tree | 8c4ae9640abcb8f33326e96e661f711417e5307c /src/image.c | |
| parent | 5be4d5336db8be316100a5b80ee8c5e428438b9e (diff) | |
| parent | 92edaeeda5c362acf2c7e7f72b3666ab7673699a (diff) | |
| download | emacs-bb9c4b4f8b3dcd1b5fc96d2d0275cc532832fbd6.tar.gz emacs-bb9c4b4f8b3dcd1b5fc96d2d0275cc532832fbd6.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 460-475)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 145-152)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-118
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index dac896137c3..30c01702d85 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3151,7 +3151,7 @@ xbm_read_bitmap_data (f, contents, end, width, height, data) | |||
| 3151 | expect_ident ("define"); | 3151 | expect_ident ("define"); |
| 3152 | expect (XBM_TK_IDENT); | 3152 | expect (XBM_TK_IDENT); |
| 3153 | 3153 | ||
| 3154 | if (LA1 == XBM_TK_NUMBER); | 3154 | if (LA1 == XBM_TK_NUMBER) |
| 3155 | { | 3155 | { |
| 3156 | char *p = strrchr (buffer, '_'); | 3156 | char *p = strrchr (buffer, '_'); |
| 3157 | p = p ? p + 1 : buffer; | 3157 | p = p ? p + 1 : buffer; |