From b684a684ce853eba64a4e91977621fce8b279044 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Tue, 21 Oct 2008 11:58:16 +0200 Subject: [PATCH] pushString: fix syntax error fix style in change-sym-types.patch B.W. --- Patch: !pushString.patch Patch: !change-sym-types.patch --- change-sym-types.patch | 9 +++++---- pushString.patch | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/change-sym-types.patch b/change-sym-types.patch index 74eb64f..0ab3628 100644 --- a/change-sym-types.patch +++ b/change-sym-types.patch @@ -1,10 +1,10 @@ --- - source/interpret.c | 118 +++++++++++++++++++++++++++++------------------------ + source/interpret.c | 120 +++++++++++++++++++++++++++++------------------------ source/interpret.h | 20 ++++++-- source/macro.c | 39 ++++++++++------- - source/parse.y | 13 ++++- - 4 files changed, 112 insertions(+), 78 deletions(-) + source/parse.y | 13 +++-- + 4 files changed, 113 insertions(+), 79 deletions(-) diff --quilt old/source/interpret.c new/source/interpret.c --- old/source/interpret.c @@ -148,12 +148,13 @@ diff --quilt old/source/interpret.c new/source/interpret.c - } else if (s->type == PROC_VALUE_SYM) { - char *errMsg; - if (!s->value.val.subr(FocusWindow, NULL, 0, &symVal, &errMsg)) { +- EXEC_ERROR(errMsg, s->name); + break; + + case BUILT_IN_VAR_TAG: { + char *errMsg; + if (!s->value.val.subr(FocusWindow, NULL, 0, &symVal, &errMsg)) { - EXEC_ERROR(errMsg, s->name); ++ EXEC_ERROR(errMsg, s->name); + } } - } else diff --git a/pushString.patch b/pushString.patch index c5f7712..9edc041 100644 --- a/pushString.patch +++ b/pushString.patch @@ -381,7 +381,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c + src = printableString(src, &cut); printd(" <%s %u:\"%s\"%s>", tagToStr(STRING_TAG), - len, s, src[k] ? "..." : ""); -+ len, src, ? "..." : ""); ++ len, src, cut ? "..." : ""); } } break; -- 2.11.4.GIT