[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/nsterm.m,v
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] Changes to emacs/src/nsterm.m,v |
Date: |
Mon, 04 Aug 2008 14:39:28 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 08/08/04 14:39:27
Index: src/nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/nsterm.m 3 Aug 2008 20:34:00 -0000 1.21
+++ src/nsterm.m 4 Aug 2008 14:39:26 -0000 1.22
@@ -1458,17 +1458,13 @@
NSEnumerator *lenum, *cenum;
NSString *name;
NSColorList *clist;
+
#ifdef NS_IMPL_GNUSTEP
/* XXX: who is wrong, the requestor or the implementation? */
if ([nsname compare: @"Highlight" options: NSCaseInsensitiveSearch]
== NSOrderedSame)
nsname = @"highlightColor";
#endif
- if ([nsname compare: @"dark blue" options: NSCaseInsensitiveSearch]
- == NSOrderedSame
- || [nsname compare: @"darkblue" options: NSCaseInsensitiveSearch]
- == NSOrderedSame)
- nsname = @"navy blue";
lenum = [[NSColorList availableColorLists] objectEnumerator];
while ( (clist = [lenum nextObject]) && new == nil)
@@ -4645,17 +4641,10 @@
return rect;
}
-#ifdef NS_IMPL_GNUSTEP
-- (long)conversationIdentifier
-{
- return (long)self;
-}
-#else
- (NSInteger)conversationIdentifier
{
return (NSInteger)self;
}
-#endif
/* TODO: below here not yet implemented correctly, but may not be needed */
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Adrian Robert, 2008/08/01
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Adrian Robert, 2008/08/01
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Chong Yidong, 2008/08/01
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Chong Yidong, 2008/08/03
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v,
Adrian Robert <=
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Adrian Robert, 2008/08/04
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Adrian Robert, 2008/08/20
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, David Reitter, 2008/08/21
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, David Reitter, 2008/08/23
- [Emacs-diffs] Changes to emacs/src/nsterm.m,v, Kenichi Handa, 2008/08/29