From: Jan Djärv <jan.h.d@swipnet.se>
Date: Wed, 21 Dec 2011 06:37:49 +0000 (+0100)
Subject: Attribute Aquamacs code to David Reitter.
X-Git-Tag: emacs-pretest-24.0.93~138
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=678f4426c3e42029becee680b99f31d5cd254626;p=emacs.git

Attribute Aquamacs code to David Reitter.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 3cdc0111506..673d6fb9d97 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,16 +1,22 @@
 2011-12-18  Jan Djärv  <jan.h.d@swipnet.se>
 
+	* nsmenu.m (NSMenuDidBeginTrackingNotification): Declare if OSX < 10.5
+	and NS_IMPL_COCOA.
+	(trackingNotification): Surround with ifdef NS_IMPL_COCOA.
+	(syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA.
+
+2011-12-18 David Reitter <reitter@cmu.edu>
+
 	* nsterm.m (ns_term_init): Subscribe for notifications
 	NSMenuDidBeginTrackingNotification and NSMenuDidEndTrackingNotification
 	to method trackingNotification in EmacsMenu.
 
 	* nsmenu.m (trackingMenu): New variable.
-	(NSMenuDidBeginTrackingNotification): Declare if OSX < 10.5 and
-	NS_IMPL_COCOA.
 	(trackingNotification): New method (from Aquamacs).
 	(menuNeedsUpdate): Expand comment and return if trackingMenu is 0,
 	from Aquamacs (Bug#7030).
-	(syms_of_nsmenu): Set trackingMenu to 1 if not NS_IMPL_COCOA.
+
+2011-12-18  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsselect.m (CUT_BUFFER_SUPPORT): Remove define.
 	(symbol_to_nsstring): Fix indentation.