Permalink
Browse files

nsterm: address compiler warnings. Assume 10.6 as build system.

  • Loading branch information...
1 parent e9954d3 commit f6e0d7aef00e2658956f834986c56fab4e54bb66 @davidswelt committed Sep 28, 2013
Showing with 6 additions and 5 deletions.
  1. +1 −0 aquamacs/doc/latex/changelog.tex
  2. +1 −1 src/nsterm.h
  3. +4 −4 src/nsterm.m
@@ -11,6 +11,7 @@ \subsection{Changes--- 2.x}
\item Isearch no longer aborts a search at seemingly random (but rare) times. Reported by Bill Sacks.
\item Clicking on the Aquamacs dock icon will again create a new buffer or de-minimize a window, as is standard on OS X.
Reported by Guy Gascoigne-Piggford.
+\item Aquamacs now requires OS X 10.6 or later as a build system.
\end{itemize}
\subsection{Changes--- 2.5}
View
@@ -62,7 +62,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
@class EmacsToolbar;
-@interface EmacsView : NSView <NSTextInput> /* 10.6+: NSWindowDelegate */
+@interface EmacsView : NSView <NSTextInput, NSWindowDelegate> /* NSWindowDelegate: 10.6 only.*/
{
char *old_title;
BOOL windowClosing;
View
@@ -5586,9 +5586,9 @@ - (NSRect)firstRectForCharacterRange: (NSRange)theRange
}
-- (long)conversationIdentifier
+- (NSInteger)conversationIdentifier
{
- return (long)self;
+ return (NSInteger)self;
}
@@ -6105,7 +6105,7 @@ - (BOOL)isOpaque
tem = f->name;
name = [NSString stringWithUTF8String:
- NILP (tem) ? (unsigned char *)"Aquamacs" : SDATA (tem)];
+ NILP (tem) ? (const char *)"Aquamacs" : SDATA (tem)];
[win setTitle: name];
/* toolbar support */
@@ -6486,7 +6486,7 @@ -(BOOL)performDragOperation: (id <NSDraggingInfo>) sender
NSTRACE (performDragOperation);
if (!emacs_event)
- return;
+ return NO;
position = [self convertPoint: [sender draggingLocation] fromView: nil];
x = lrint (position.x); y = lrint (position.y);

0 comments on commit f6e0d7a

Please sign in to comment.