Mercurial > emacs
diff src/frame.c @ 83518:ab6ab63755f7
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-285
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-286
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-287
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-288
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-102
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 20 May 2006 10:32:11 +0000 |
parents | b6689e223e2f 756f8d98d484 |
children | b2e7507b55c6 |
line wrap: on
line diff
--- a/src/frame.c Wed May 17 18:05:02 2006 +0000 +++ b/src/frame.c Sat May 20 10:32:11 2006 +0000 @@ -3443,10 +3443,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); }