pinosaur
/
st.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[st.git]
/
st.c
diff --git
a/st.c
b/st.c
index
0204b2e
..
8e51344
100644
(file)
--- a/
st.c
+++ b/
st.c
@@
-2268,8
+2268,7
@@
strhandle(void) {
term.esc &= ~(ESC_STR_END|ESC_STR);
strparse();
term.esc &= ~(ESC_STR_END|ESC_STR);
strparse();
- narg = strescseq.narg;
- par = atoi(strescseq.args[0]);
+ par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
switch(strescseq.type) {
case ']': /* OSC -- Operating System Command */
switch(strescseq.type) {
case ']': /* OSC -- Operating System Command */
@@
-2927,7
+2926,7
@@
xloadcols(void) {
Color *cp;
if(loaded) {
Color *cp;
if(loaded) {
- for (cp = dc.col; cp <
dc.col + LEN(dc.col)
; ++cp)
+ for (cp = dc.col; cp <
&dc.col[LEN(dc.col)]
; ++cp)
XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
}
XftColorFree(xw.dpy, xw.vis, xw.cmap, cp);
}
@@
-4066,7
+4065,7
@@
run:
if(argc > 0) {
/* eat all remaining arguments */
opt_cmd = argv;
if(argc > 0) {
/* eat all remaining arguments */
opt_cmd = argv;
- if(!opt_title)
+ if(!opt_title
&& !opt_line
)
opt_title = basename(xstrdup(argv[0]));
}
setlocale(LC_CTYPE, "");
opt_title = basename(xstrdup(argv[0]));
}
setlocale(LC_CTYPE, "");