diff options
| author | Karoly Lorentey <[email protected]> | 2006-05-20 10:32:11 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-05-20 10:32:11 +0000 |
| commit | aabd1a8b138a7f5907c3bb0bbd40932fa7b8e9fe (patch) | |
| tree | 7db1ed5481ec4ec6b43271d0ea57c032c22f60fc /src/frame.c | |
| parent | 9f97e26d01003a17b861505d535c89ad73799b7e (diff) | |
| parent | 689840b9224725a0beae741aaaa325d7edb2244c (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-285
Update from CVS
* [email protected]/emacs--devo--0--patch-286
Update from CVS
* [email protected]/emacs--devo--0--patch-287
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-288
Update from CVS
* [email protected]/gnus--rel--5.10--patch-102
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-558
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c index 094453ed33..f29bca1796 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3443,10 +3443,8 @@ x_set_border_width (f, arg, oldval) if (XINT (arg) == f->border_width) return; -#ifndef MAC_OS if (FRAME_X_WINDOW (f) != 0) error ("Cannot change the border width of a frame"); -#endif /* MAC_TODO */ f->border_width = XINT (arg); } |