diff options
| author | Miles Bader | 2006-06-07 18:05:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-06-07 18:05:10 +0000 |
| commit | b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb (patch) | |
| tree | de3804210a8cd955e0d3b9abc15679480930bc82 /src/frame.c | |
| parent | 885b7d0991bd4b4b8f4bd1d3cd21c18a697bbce2 (diff) | |
| parent | 26c9afc3239e18b03537faaea33e3e82e28099e6 (diff) | |
| download | emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.tar.gz emacs-b883cdb2fefa8ea9c3b0d82eba7a9ee792f871bb.zip | |
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
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 1606f195f90..cafa9b655d4 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -3156,10 +3156,8 @@ x_set_border_width (f, arg, oldval) | |||
| 3156 | if (XINT (arg) == f->border_width) | 3156 | if (XINT (arg) == f->border_width) |
| 3157 | return; | 3157 | return; |
| 3158 | 3158 | ||
| 3159 | #ifndef MAC_OS | ||
| 3160 | if (FRAME_X_WINDOW (f) != 0) | 3159 | if (FRAME_X_WINDOW (f) != 0) |
| 3161 | error ("Cannot change the border width of a frame"); | 3160 | error ("Cannot change the border width of a frame"); |
| 3162 | #endif /* MAC_TODO */ | ||
| 3163 | 3161 | ||
| 3164 | f->border_width = XINT (arg); | 3162 | f->border_width = XINT (arg); |
| 3165 | } | 3163 | } |