1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0263
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0263
Problem: Channel log doesn't show part of channel.
Solution: Add "sock", "out", "err" or "in". (Ozaki Kiichi, closes #3303)
Files: src/channel.c
*** ../vim-8.1.0262/src/channel.c 2018-07-08 17:18:58.416462371 +0200
--- src/channel.c 2018-08-09 22:13:36.575628935 +0200
***************
*** 138,144 ****
}
static void
! ch_log_lead(const char *what, channel_T *ch)
{
if (log_fd != NULL)
{
--- 138,144 ----
}
static void
! ch_log_lead(const char *what, channel_T *ch, ch_part_T part)
{
if (log_fd != NULL)
{
***************
*** 150,156 ****
fprintf(log_fd, "%s ", profile_msg(&log_now));
#endif
if (ch != NULL)
! fprintf(log_fd, "%son %d: ", what, ch->ch_id);
else
fprintf(log_fd, "%s: ", what);
}
--- 150,162 ----
fprintf(log_fd, "%s ", profile_msg(&log_now));
#endif
if (ch != NULL)
! {
! if (part < PART_COUNT)
! fprintf(log_fd, "%son %d(%s): ",
! what, ch->ch_id, part_names[part]);
! else
! fprintf(log_fd, "%son %d: ", what, ch->ch_id);
! }
else
fprintf(log_fd, "%s: ", what);
}
***************
*** 166,172 ****
{
va_list ap;
! ch_log_lead("", ch);
va_start(ap, fmt);
vfprintf(log_fd, fmt, ap);
va_end(ap);
--- 172,178 ----
{
va_list ap;
! ch_log_lead("", ch, PART_COUNT);
va_start(ap, fmt);
vfprintf(log_fd, fmt, ap);
va_end(ap);
***************
*** 191,197 ****
{
va_list ap;
! ch_log_lead("ERR ", ch);
va_start(ap, fmt);
vfprintf(log_fd, fmt, ap);
va_end(ap);
--- 197,203 ----
{
va_list ap;
! ch_log_lead("ERR ", ch, PART_COUNT);
va_start(ap, fmt);
vfprintf(log_fd, fmt, ap);
va_end(ap);
***************
*** 1849,1855 ****
if (ch_log_active() && lead != NULL)
{
! ch_log_lead(lead, channel);
fprintf(log_fd, "'");
ignored = (int)fwrite(buf, len, 1, log_fd);
fprintf(log_fd, "'\n");
--- 1855,1861 ----
if (ch_log_active() && lead != NULL)
{
! ch_log_lead(lead, channel, part);
fprintf(log_fd, "'");
ignored = (int)fwrite(buf, len, 1, log_fd);
fprintf(log_fd, "'\n");
***************
*** 3718,3724 ****
if (ch_log_active())
{
! ch_log_lead("SEND ", channel);
fprintf(log_fd, "'");
ignored = (int)fwrite(buf_arg, len_arg, 1, log_fd);
fprintf(log_fd, "'\n");
--- 3724,3730 ----
if (ch_log_active())
{
! ch_log_lead("SEND ", channel, part);
fprintf(log_fd, "'");
ignored = (int)fwrite(buf_arg, len_arg, 1, log_fd);
fprintf(log_fd, "'\n");
*** ../vim-8.1.0262/src/version.c 2018-08-09 22:08:53.017560100 +0200
--- src/version.c 2018-08-09 22:14:51.103121696 +0200
***************
*** 796,797 ****
--- 796,799 ----
{ /* Add new patch number below this line */
+ /**/
+ 263,
/**/
--
Veni, Vidi, VW -- I came, I saw, I drove around in a little car.
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
