]> git.eshelyaron.com Git - emacs.git/commitdiff
Use modern constant names for the NS pasteboard
authorDaniel Martín <mardani29@yahoo.es>
Fri, 18 Sep 2020 11:36:47 +0000 (13:36 +0200)
committerAlan Third <alan@idiocy.org>
Fri, 18 Sep 2020 19:06:36 +0000 (20:06 +0100)
Use the same pasteboard constant names defined in
ns_drag_types. (Bug#43470).

* src/nsterm.m: Rename NSURLPboardType to NSPasteboardTypeURL,
NSStringPboardType to NSPasteboardTypeString, and
NSTabularTextPboardType to NSPasteboardTypeTabularText

src/nsterm.m

index ac467840a258aee1c10cb05487d4509a4e6c97d0..3dd915e3703c81f41913405ae2192bf7f3dd02e2 100644 (file)
@@ -8363,7 +8363,7 @@ not_in_argv (NSString *arg)
       while ( (file = [fenum nextObject]) )
         strings = Fcons (build_string ([file UTF8String]), strings);
     }
-  else if ([type isEqualToString: NSURLPboardType])
+  else if ([type isEqualToString: NSPasteboardTypeURL])
     {
       NSURL *url = [NSURL URLFromPasteboard: pb];
       if (url == nil) return NO;
@@ -8372,8 +8372,8 @@ not_in_argv (NSString *arg)
 
       strings = list1 (build_string ([[url absoluteString] UTF8String]));
     }
-  else if ([type isEqualToString: NSStringPboardType]
-           || [type isEqualToString: NSTabularTextPboardType])
+  else if ([type isEqualToString: NSPasteboardTypeString]
+           || [type isEqualToString: NSPasteboardTypeTabularText])
     {
       NSString *data;