aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2007-10-09 01:40:05 +0000
committerRichard M. Stallman2007-10-09 01:40:05 +0000
commit65342ae38594f2e07734ac09b66b3964fb01cb57 (patch)
tree141479685e2547c3a7f08d4a7e42338c55d5a6f7 /src
parent0f1947abae6af6bd9ab3e59f4deae0cdc24ab43a (diff)
downloademacs-65342ae38594f2e07734ac09b66b3964fb01cb57.tar.gz
emacs-65342ae38594f2e07734ac09b66b3964fb01cb57.zip
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/image.c6
2 files changed, 13 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cfdf17f0842..541432e70bf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
12007-10-09 Richard Stallman <rms@gnu.org>
2
3 * image.c (free_bitmap_record): Renamed from Free_Bitmap_Record.
4
52007-09-29 Richard Stallman <rms@gnu.org>
6
7 * eval.c (internal_condition_case_2, internal_condition_case_1)
8 (internal_condition_case): Reenable abort if x_catching_errors ()
9 to see if that really happens and why.
10
12007-10-06 Andreas Schwab <schwab@suse.de> 112007-10-06 Andreas Schwab <schwab@suse.de>
2 12
3 * fileio.c (Fwrite_region): Ignore EINVAL error from fsync. 13 * fileio.c (Fwrite_region): Ignore EINVAL error from fsync.
diff --git a/src/image.c b/src/image.c
index c708bf0374f..81a42f91da2 100644
--- a/src/image.c
+++ b/src/image.c
@@ -532,7 +532,7 @@ x_create_bitmap_from_file (f, file)
532/* Free bitmap B. */ 532/* Free bitmap B. */
533 533
534static void 534static void
535Free_Bitmap_Record (dpyinfo, bm) 535free_bitmap_record (dpyinfo, bm)
536 Display_Info *dpyinfo; 536 Display_Info *dpyinfo;
537 Bitmap_Record *bm; 537 Bitmap_Record *bm;
538{ 538{
@@ -574,7 +574,7 @@ x_destroy_bitmap (f, id)
574 if (--bm->refcount == 0) 574 if (--bm->refcount == 0)
575 { 575 {
576 BLOCK_INPUT; 576 BLOCK_INPUT;
577 Free_Bitmap_Record (dpyinfo, bm); 577 free_bitmap_record (dpyinfo, bm);
578 UNBLOCK_INPUT; 578 UNBLOCK_INPUT;
579 } 579 }
580 } 580 }
@@ -591,7 +591,7 @@ x_destroy_all_bitmaps (dpyinfo)
591 591
592 for (i = 0; i < dpyinfo->bitmaps_last; i++, bm++) 592 for (i = 0; i < dpyinfo->bitmaps_last; i++, bm++)
593 if (bm->refcount > 0) 593 if (bm->refcount > 0)
594 Free_Bitmap_Record (dpyinfo, bm); 594 free_bitmap_record (dpyinfo, bm);
595 595
596 dpyinfo->bitmaps_last = 0; 596 dpyinfo->bitmaps_last = 0;
597} 597}