Mercurial > emacs
comparison src/frame.c @ 90399:a5812696f7bf unicode-pre-font-backend
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 274-284)
- Update from CVS
- Update etc/MORE.STUFF.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 101)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 17 May 2006 07:46:49 +0000 |
parents | 2ecafc6d5db7 1cadc44e0431 |
children | 6dcadac04bea |
comparison
equal
deleted
inserted
replaced
90398:1f8d5cd37cf0 | 90399:a5812696f7bf |
---|---|
3140 if (XINT (arg) == f->border_width) | 3140 if (XINT (arg) == f->border_width) |
3141 return; | 3141 return; |
3142 | 3142 |
3143 #ifndef MAC_OS | 3143 #ifndef MAC_OS |
3144 if (FRAME_X_WINDOW (f) != 0) | 3144 if (FRAME_X_WINDOW (f) != 0) |
3145 error ("Cannot change the border width of a window"); | 3145 error ("Cannot change the border width of a frame"); |
3146 #endif /* MAC_TODO */ | 3146 #endif /* MAC_TODO */ |
3147 | 3147 |
3148 f->border_width = XINT (arg); | 3148 f->border_width = XINT (arg); |
3149 } | 3149 } |
3150 | 3150 |