diff options
author | Eli Zaretskii <eliz@gnu.org> | 2023-08-12 13:42:14 -0400 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2023-08-12 13:42:14 -0400 |
commit | b289f0769f0a43fdaabec41b92bacc51acbc4b9b (patch) | |
tree | af63ebaee6937d7bf1be228948d81681527f056c /exec | |
parent | de6c1c4d5c92b92d5b280e157c2a5bc3228749f2 (diff) | |
parent | 4767f5eaeedef57dfcc119399e5855f41c2e1be5 (diff) | |
download | emacs-b289f0769f0a43fdaabec41b92bacc51acbc4b9b.tar.gz |
Merge from origin/emacs-29
4767f5eaeed Better fix for bug#65156
dd1d8414b33 Fix insert-file-contents with pipes and /dev/stdin
50649a6d1a2 ; * etc/PROBLEMS: Fix wording.
f0dda682ffb ; * etc/NEWS.28: Add deletion of levents.el.
f4acae842c0 Fix bug#65042
e1874c4e8bf * configure.ac (HAVE_TREE_SITTER): Set NEED_DYNLIB=yes (b...
ef8838c3a5f * etc/NEWS: Mention tramp-show-ad-hoc-proxies.
495bee253fc * test/lisp/net/tramp-tests.el (tramp-test42-utf8): Skip ...
de1effd73b4 ; Fix last change
7c7966862bc * test/lisp/net/tramp-tests.el (tramp-test10-write-region...
16205e8db65 ; Improve help-echo in package.el
a95e7006989 ; Filter packages available for upgrade via menu bar
adff72dd1d2 Fix reverting Rmail buffers
Diffstat (limited to 'exec')
-rw-r--r-- | exec/exec.c | 2 | ||||
-rw-r--r-- | exec/mipsel-user.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/exec/exec.c b/exec/exec.c index 0d9187cabfa..935c94a59af 100644 --- a/exec/exec.c +++ b/exec/exec.c @@ -1036,7 +1036,7 @@ exec_0 (char *name, struct exec_tracee *tracee, } /* Add a directory separator if necessary. */ - + if (!link_size || buffer1[link_size - 1] != '/') buffer1[link_size] = '/', link_size++; diff --git a/exec/mipsel-user.h b/exec/mipsel-user.h index dc3f98eb4e7..9c5a445c9aa 100644 --- a/exec/mipsel-user.h +++ b/exec/mipsel-user.h @@ -40,4 +40,3 @@ struct mipsel_regs }; #endif /* _MIPSEL_USER_H_ */ - |