Adam Majer
3be791fd2c
- Core
- Tell the current directory to the terminal using OSC 7 sequence (so it can open new tabs there) (#3088)
- Preserve ext2fs attributes on copy/move operations (#4532)
- Change name of temporary directory: make it unique for each run (#4535)
- Hide password in file operation progress dialog (#4541)
- Support reget in file move operation (#4563)
- Implement nanosecond precision timestamps on non-Linux (macOS, BSD, AIX, Solaris) (#4563)
- Remove remaining mmap code to simplify maintenance (#3960)
- VFS
- extfs: support unrar-7 (#4518)
- Editor
- Improve syntax highlighting:
- C and C++ (MidnightCommander?/mc#195, #4556)
- Viewer
- Diff viewer
- Add man page mcdiff.1 (#4224)
- Misc
- Code cleanup (#4524)
- New skins
- xoria256-thin, xoria256root-thin (#4530)
- modarcon16-defbg-thin, modarcon16-thin, modarcon16root-defbg-thin, modarcon16root-thin (#4530)
- modarin256-defbg-thin, modarin256-thin, modarin256root-defbg-thin, modarin256root-thin (#4530)
- julia256root (#4536)
- mc.ext.ini: clarify escaping of spaces and parenthesis (#4502)
- Fixes
- External editor does not work with arguments in $EDITOR (#4533)
- fish shell: strings " cd (printf '%b' ... " in history (#4521)
- Redundant back slashes for autocomplete (#4292)
- subshell: call execl with argv[0] that is not an actual path to Bash (#4549)
- mcedit: php.syntax: comment highlight from start of light only (#4519)
- mcedit: wrong replacement using regular expressions with begin or end of line (#4525, #4526)
- mcedit: losing column position when navigating up/down (MidnightCommander?/mc#194)
- mcedit: macro deletes text (#4540)
- mcedit: macros are applied to the pasted text (#4562)
- extfs: iso9660: xorriso is slow to open an ISO image (#3570, #4567)
- extfs: u7z: wrong add of nested directories to archive (#4559)
- extfs: segfault on enter to deleted archive (#4560)
- tar: segfault on copy files from archive (#4561)
- man: typo (#4550)
- Remove mc-extfs-iso9660-xorriso.patch patch which doesn't apply anymore.
- Other patches reapplied.
OBS-URL: https://build.opensuse.org/package/show/Base:System/mc?expand=0&rev=160
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
---
|
|
contrib/Makefile.am | 4 ++--
|
|
contrib/mc.sh.in | 9 ++++++++-
|
|
2 files changed, 10 insertions(+), 3 deletions(-)
|
|
|
|
--- a/contrib/Makefile.am
|
|
+++ b/contrib/Makefile.am
|
|
@@ -19,10 +19,10 @@ EXTRA_DIST = \
|
|
$(noinst_DATA)
|
|
|
|
mc.csh: $(top_builddir)/config.status $(srcdir)/mc.csh.in
|
|
- $(SED) "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.csh.in > mc.csh
|
|
+ $(SED) "s%@""datadir@%$(datadir)%" $(srcdir)/mc.csh.in > mc.csh
|
|
|
|
mc.sh: $(top_builddir)/config.status $(srcdir)/mc.sh.in
|
|
- $(SED) "s%@""pkglibexecdir@%$(pkglibexecdir)%" $(srcdir)/mc.sh.in > mc.sh
|
|
+ $(SED) "s%@""datadir@%$(datadir)%" $(srcdir)/mc.sh.in > mc.sh
|
|
|
|
mc-wrapper.csh: $(top_builddir)/config.status $(srcdir)/mc-wrapper.csh.in
|
|
$(SED) "s%@""bindir@%$(bindir)%" $(srcdir)/mc-wrapper.csh.in > mc-wrapper.csh
|
|
--- a/contrib/mc.sh.in
|
|
+++ b/contrib/mc.sh.in
|
|
@@ -1,3 +1,10 @@
|
|
# Don't define aliases in plain Bourne shell
|
|
[ -n "${BASH_VERSION}${KSH_VERSION}${ZSH_VERSION}" ] || return 0
|
|
-alias mc='. @pkglibexecdir@/mc-wrapper.sh'
|
|
+mc()
|
|
+{
|
|
+. @datadir@/mc/mc-wrapper.sh
|
|
+}
|
|
+if [ -n "$BASH_VERSION" ]
|
|
+then
|
|
+ export -f mc
|
|
+fi
|