[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: fixing non-NS darwin (was: Re: your emacs/src/keyboard.h change)

From: Adrian Robert
Subject: Re: fixing non-NS darwin (was: Re: your emacs/src/keyboard.h change)
Date: Mon, 4 Aug 2008 12:11:31 -0400

On Aug 3, 2008, at 12:41 PM, Adrian Robert wrote:

On Aug 3, 2008, at 11:59 AM, Dan Nicolaescu wrote:

This code in emacs.c is not right:

#if defined (NS_IMPL_COCOA)
if (!initialized)
  unexec_init_emacs_zone ();

it should be done on all MacOSX configs.

I've been looking at this, and made a diff of before and after remove-carbon to see what else might have been affected, since I never realized that the undef MAC_OSX wasn't working.

OK, the above should be fixed. (DARWIN_OS is set in darwin.h and used to indicate on OS X or pure Darwin; unexmacosx.c should be at some point renamed to unexdarwin.c.)

I've also gone through the removal diff and wanted to ask about the bit below since it may be something that all terms should do:

Index: atimer.c
RCS file: /sources/emacs/emacs/src/atimer.c,v
retrieving revision 1.28
retrieving revision 1.27
diff -u -r1.28 -r1.27
--- atimer.c    27 Jul 2008 18:24:40 -0000      1.28
+++ atimer.c    14 May 2008 07:49:08 -0000      1.27
@@ -368,7 +368,9 @@

       t = atimers;
       atimers = atimers->next;
+#ifndef MAC_OSX
       t->fn (t);

       if (t->type == ATIMER_CONTINUOUS)
@@ -380,6 +382,10 @@
          t->next = free_atimers;
          free_atimers = t;
+#ifdef MAC_OSX
+ /* Fix for Ctrl-G. Perhaps this should apply to all platforms. */
+      t->fn (t);

       EMACS_GET_TIME (now);

reply via email to

[Prev in Thread] Current Thread [Next in Thread]