options.mk:
  Synced with editors/emacs-snapshot, but found some logic error
  mainly for nextstep. Fixed and verified on 10.6.0.
  In nextstep (i.e. Mac OS X) now only need for
     PKG_OPTIONS.emacs_current=nextstep (x11 is logically OK).
PLIST
  Updated to follow upstream change.