view admin/notes/BRANCH @ 105563:159c68c1e3be

2009-10-11 Adrian Robert <[e-mail]> Changes for 64-bit compile under Snow Leopard. * nsfns.m (xw-color-values): Use CGFloat where appropriate. * nsfont.m (ns_char_width): Replace deprecated call (suggested by Erik Charlebois). (ns_findfonts, nsfont_list_family): Use long format in printf, and cast argument. (nsfont_open): Use ns_char_width() everywhere. (ns_uni_to_glyphs, NSGlyphStorage): Use NS[U]Integer where appropriate. * nsgui.h (NSPoint, NSSize) [!__OBJC__]: Define and use CGFloat. * nsimage.m (EmacsImage-setXBMColor:,-getPixelAtX:Y:): Use CGFloat where appropriate. * nsmenu.m (EmacsMenu-addItemWithWidgetValue:): Use NSInteger where appropriate. (EmacsToolbar-addDisplayItemWithImage:idx:helpText:enabled:): Use stringWithUTF8String. (EmacsDialogPanel-initWithContentRect:styleMask:): Fix signature. * nsterm.h (EmacsView, EmacsMenu, EmacsToolbar, EmacsTooltip): Add formal protocol mention to inheritance. [NS_HAVE_NSINTEGER]: Drop conditional and contents. * nsterm.m (ns_color_to_lisp): Use CGFloat where appropriate. Fix printf format. (ns_query_color): Use CGFloat where appropriate. (EmacsView<NSTextInput>, EmacsScroller): Fix method signatures. (EmacsScroller-mouseDown:) Use long format in printf, and cast argument.

This file describes the CVS branch in which it is maintained.
Everything below the line is branch-specific.
________________________________________________________________________

This is the trunk (sometimes mistakenly called "HEAD").
When people say "use CVS emacs", this is the branch they are talking
about.  Likewise, a "cvs checkout" without the "-r" option results in
this branch.

Emacs development takes place on the trunk.  Most of the time, Emacs
hackers add to it relatively free of constraint (aside from proper
legal / accounting practices), although sometimes there is related
discussion on the emacs-devel mailing list.

Sometime before the release of a new major version of Emacs (eg 22.1),
a "feature freeze" is imposed on the trunk.  No new features may be
added after this point.  This is usually many months before the release.
During this time, there is no official place for development of new features.

Shortly before the release, a release branch is created.  For example,
EMACS_22_BASE or EMACS_21_1_RC for Emacs 22.x and 21.x, respectively.
(Unfortunately the naming scheme has not always been consistent.)

The release branch is used to make the release (22.1), and all later
members of the series (22.2, 22.3, etc).  Generally, only bug-fixes have
been allowed in the minor releases, although in 22.x, self-contained
new features were allowed on a case-by-case basis.

From the point that a release branch is created, the trunk is free for
development for the next major version.