diff options
| author | Dan Nicolaescu | 2010-04-15 14:52:27 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-04-15 14:52:27 -0700 |
| commit | 00030710427af3bb3a1798690985d83e1bcba67c (patch) | |
| tree | fc78df59a49c10d0a0aa26c150ebda0e9c8fe478 /src | |
| parent | 6bb244570e95ee5e7178d55ca94da8cec3b0a3c0 (diff) | |
| download | emacs-00030710427af3bb3a1798690985d83e1bcba67c.tar.gz emacs-00030710427af3bb3a1798690985d83e1bcba67c.zip | |
* frame.h (FRAME_SAMPLE_VISIBILITY): Undo previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/frame.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 668dc24e229..0ab926b8bb3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | * xdisp.c (message): Do not use NO_ARG_ARRAY. | 3 | * xdisp.c (message): Do not use NO_ARG_ARRAY. |
| 4 | 4 | ||
| 5 | * frame.h (FRAME_SAMPLE_VISIBILITY): Remove unused 0 in comma expression. | ||
| 6 | |||
| 7 | 2010-04-14 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2010-04-14 Dan Nicolaescu <dann@ics.uci.edu> |
| 8 | 6 | ||
| 9 | Reduce cpp use in Makefile.in. | 7 | Reduce cpp use in Makefile.in. |
diff --git a/src/frame.h b/src/frame.h index 8f563ca9d77..36b0b6b069c 100644 --- a/src/frame.h +++ b/src/frame.h | |||
| @@ -793,7 +793,7 @@ typedef struct frame *FRAME_PTR; | |||
| 793 | 793 | ||
| 794 | #define FRAME_SAMPLE_VISIBILITY(f) \ | 794 | #define FRAME_SAMPLE_VISIBILITY(f) \ |
| 795 | (((f)->async_visible && (f)->visible != (f)->async_visible) ? \ | 795 | (((f)->async_visible && (f)->visible != (f)->async_visible) ? \ |
| 796 | SET_FRAME_GARBAGED (f) : \ | 796 | SET_FRAME_GARBAGED (f) : 0, \ |
| 797 | (f)->visible = (f)->async_visible, \ | 797 | (f)->visible = (f)->async_visible, \ |
| 798 | (f)->iconified = (f)->async_iconified) | 798 | (f)->iconified = (f)->async_iconified) |
| 799 | 799 | ||