diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-09 16:13:15 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-09 16:13:15 +0000 |
commit | 92f4ebab8981edf4393fe35ae6399bc1a19709e3 (patch) | |
tree | ef028d633b9966a9d12278276f8f79f7e806c60e /mac | |
parent | 5a9018202a92367e84b7607c8c7f8047501307f3 (diff) | |
parent | 062e4a45429d2b5b027cc04c138c220c069dc3fb (diff) | |
download | emacs-92f4ebab8981edf4393fe35ae6399bc1a19709e3.tar.gz |
Merged from miles@gnu.org--gnu-2005 (patch 292-295)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-292
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-293
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-294
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-295
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-342
Diffstat (limited to 'mac')
-rw-r--r-- | mac/ChangeLog | 4 | ||||
-rw-r--r-- | mac/inc/config.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 27cd5d98be9..96ba2ee5201 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -1,3 +1,7 @@ +2005-05-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * inc/config.h [HAVE_CARBON]: Define USE_TOOLKIT_SCROLL_BARS. + 2005-04-24 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * makefile.MPW (MacObjects): Add macselect.c.x. diff --git a/mac/inc/config.h b/mac/inc/config.h index c996cce4bfd..c81db673cca 100644 --- a/mac/inc/config.h +++ b/mac/inc/config.h @@ -91,7 +91,9 @@ Boston, MA 02111-1307, USA. */ /* #undef HAVE_XAW3D */ /* Define if we should use toolkit scroll bars. */ -/* #undef USE_TOOLKIT_SCROLL_BARS */ +#ifdef HAVE_CARBON +#define USE_TOOLKIT_SCROLL_BARS 1 +#endif /* Define if we should use XIM, if it is available. */ /* #undef USE_XIM */ |