From: Eli Zaretskii Date: Mon, 25 May 2015 15:08:09 +0000 (+0300) Subject: Fix a typo in last commit X-Git-Tag: emacs-25.0.90~1975 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ac59d538982d040c215ef7689f253abbbfe3921a;p=emacs.git Fix a typo in last commit * lib-src/etags.c (C_entries): Fix a typo. * test/etags/ETAGS.good_1: * test/etags/ETAGS.good_2: * test/etags/ETAGS.good_3: * test/etags/ETAGS.good_4: * test/etags/ETAGS.good_5: * test/etags/CTAGS.good: Update due to the change in etags.c. --- diff --git a/lib-src/etags.c b/lib-src/etags.c index 73dd5a8a405..f124d290da3 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -3355,7 +3355,7 @@ C_entries (int c_ext, FILE *inf) { linebuffer_setlen (&token_name, toklen); sprintf (token_name.buffer, "%.*s", - newlb.buffer + tokoff); + toklen, newlb.buffer + tokoff); } token.named = true; } diff --git a/test/etags/CTAGS.good b/test/etags/CTAGS.good index 045c52a5796..2cfadb9ec6e 100644 --- a/test/etags/CTAGS.good +++ b/test/etags/CTAGS.good @@ -1,4 +1,3 @@ - objc-src/Subprocess.m /^@interface Subprocess(Private)$/ #a-defer-word forth-src/test-forth.fth /^defer #a-defer-word$/ #some-storage forth-src/test-forth.fth /^2000 buffer: #some-storage$/ $ make-src/Makefile /^ @-$(MAKE) OPTIONS='--no-members' ${LATEST}ediff$/ @@ -1061,6 +1060,7 @@ Pkg1_Proc2/p ada-src/waroquiers.ada /^ procedure Pkg1_Proc2 (I : Integer);$/ Pkg1_Proc2/p ada-src/waroquiers.ada /^ procedure Pkg1_Proc2 (I : Integer) is$/ PostControls pyt-src/server.py /^ def PostControls(self):$/ Pre_Call_State/t ada-src/2ataspri.ads /^ type Pre_Call_State is new System.Address;$/ +Private objc-src/Subprocess.m /^@interface Subprocess(Private)$/ Private_T/b ada-src/etags-test-for.ada /^ task body Private_T is$/ Private_T/b ada-src/waroquiers.ada /^ task body Private_T is$/ Private_T/k ada-src/etags-test-for.ada /^ task Private_T;$/ diff --git a/test/etags/ETAGS.good_1 b/test/etags/ETAGS.good_1 index dfaa5e19744..ebd079f253a 100644 --- a/test/etags/ETAGS.good_1 +++ b/test/etags/ETAGS.good_1 @@ -2366,10 +2366,10 @@ objc-src/Subprocess.h,98 #define BUFFERSIZE 43,1267 @interface Subprocess:Subprocess45,1292 -objc-src/Subprocess.m,447 +objc-src/Subprocess.m,446 #define PTY_TEMPLATE 20,494 #define PTY_LENGTH 21,528 -@interface Subprocess(Private)32,737 +@interface Subprocess(Private)32,737 - childDidExit39,851 - fdHandler:fdHandler67,1589 showError 98,2360 diff --git a/test/etags/ETAGS.good_2 b/test/etags/ETAGS.good_2 index b0b08b135bc..12554bd95f1 100644 --- a/test/etags/ETAGS.good_2 +++ b/test/etags/ETAGS.good_2 @@ -2934,11 +2934,11 @@ objc-src/Subprocess.h,98 #define BUFFERSIZE 43,1267 @interface Subprocess:Subprocess45,1292 -objc-src/Subprocess.m,477 +objc-src/Subprocess.m,476 #define PTY_TEMPLATE 20,494 #define PTY_LENGTH 21,528 static void showError(23,551 -@interface Subprocess(Private)32,737 +@interface Subprocess(Private)32,737 - childDidExit39,851 - fdHandler:fdHandler67,1589 showError 98,2360 diff --git a/test/etags/ETAGS.good_3 b/test/etags/ETAGS.good_3 index a8839e69bec..714903c205f 100644 --- a/test/etags/ETAGS.good_3 +++ b/test/etags/ETAGS.good_3 @@ -2683,10 +2683,10 @@ objc-src/Subprocess.h,98 #define BUFFERSIZE 43,1267 @interface Subprocess:Subprocess45,1292 -objc-src/Subprocess.m,447 +objc-src/Subprocess.m,446 #define PTY_TEMPLATE 20,494 #define PTY_LENGTH 21,528 -@interface Subprocess(Private)32,737 +@interface Subprocess(Private)32,737 - childDidExit39,851 - fdHandler:fdHandler67,1589 showError 98,2360 diff --git a/test/etags/ETAGS.good_4 b/test/etags/ETAGS.good_4 index 6fb92f0793a..5dd8d551460 100644 --- a/test/etags/ETAGS.good_4 +++ b/test/etags/ETAGS.good_4 @@ -2530,10 +2530,10 @@ objc-src/Subprocess.h,98 #define BUFFERSIZE 43,1267 @interface Subprocess:Subprocess45,1292 -objc-src/Subprocess.m,447 +objc-src/Subprocess.m,446 #define PTY_TEMPLATE 20,494 #define PTY_LENGTH 21,528 -@interface Subprocess(Private)32,737 +@interface Subprocess(Private)32,737 - childDidExit39,851 - fdHandler:fdHandler67,1589 showError 98,2360 diff --git a/test/etags/ETAGS.good_5 b/test/etags/ETAGS.good_5 index 8055c5951f5..526ad4079b8 100644 --- a/test/etags/ETAGS.good_5 +++ b/test/etags/ETAGS.good_5 @@ -3415,11 +3415,11 @@ objc-src/Subprocess.h,98 #define BUFFERSIZE 43,1267 @interface Subprocess:Subprocess45,1292 -objc-src/Subprocess.m,477 +objc-src/Subprocess.m,476 #define PTY_TEMPLATE 20,494 #define PTY_LENGTH 21,528 static void showError(23,551 -@interface Subprocess(Private)32,737 +@interface Subprocess(Private)32,737 - childDidExit39,851 - fdHandler:fdHandler67,1589 showError 98,2360