Mercurial > emacs
diff src/frame.c @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | 6dcadac04bea 756f8d98d484 |
children | 9430e7e49983 |
line wrap: on
line diff
--- a/src/frame.c Wed Jun 07 11:41:58 2006 +0000 +++ b/src/frame.c Wed Jun 07 18:05:10 2006 +0000 @@ -3156,10 +3156,8 @@ 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); }