Browse Source

Merge branch '4050_cleanup'

* 4050_cleanup: (27 commits)
  Update po/*.po files.
  src/editor/editdraw.c: refactoring.
  src/editor/editdraw.c: fix coding style.
  (get_key_code): yet another refactoring.
  (get_key_code): minor refactoring.
  (get_key_code): fix coding style.
  Skins: unify panel-related item names.
  Skins: move items from [widget-common] section to [widget-panel] one.
  (mc_skin_lines_load_frm): cleanup, fix coding style.
  src/filemanager/dir.c: fix coding style.
  Sync with gnulib 4d4a22ab1f719b7c6c3fe3dbf45d11baafd3c563.
  Sync with gnulib 7a15069b68a376f26c5dca34ae2689c5bf8adc99.
  lib/vfs/parse_ls_vga.c: refactoring.
  lib/vfs/parse_ls_vga.c: fix coding style.
  lib/vfs/parse_ls_vga.c: use gboolean instead of int for boolean values.
  Ticket #4068: fix preprocessor tests.
  doc/NEWS: cosmetics.
  Ticket #3355: mc-wrapper: don't cd to the same directory.
  src/textconf.c: use puts() to print simple strings.
  (show_version): show library versions.
  ...
Andrew Borodin 5 years ago
parent
commit
45bb66704b

+ 1 - 1
contrib/mc-wrapper.csh.in

@@ -10,7 +10,7 @@ endif
 
 if (-r "$MC_PWD_FILE") then
 	setenv MC_PWD "`cat '$MC_PWD_FILE'`"
-	if ( -d "$MC_PWD" ) then
+	if ("$MC_PWD" != "$cwd" && -d "$MC_PWD") then
 		cd "$MC_PWD"
 	endif
 	unsetenv MC_PWD

+ 1 - 1
contrib/mc-wrapper.sh.in

@@ -4,7 +4,7 @@ MC_PWD_FILE="${TMPDIR-/tmp}/mc-$MC_USER/mc.pwd.$$"
 
 if test -r "$MC_PWD_FILE"; then
 	MC_PWD="`cat "$MC_PWD_FILE"`"
-	if test -n "$MC_PWD" && test -d "$MC_PWD"; then
+	if test -n "$MC_PWD" && test "$MC_PWD" != "$PWD" && test -d "$MC_PWD"; then
 		cd "$MC_PWD"
 	fi
 	unset MC_PWD

+ 33 - 33
doc/NEWS

@@ -2,51 +2,51 @@ Version 4.8.24
 
 - Core
 
-  * Drop bundled gettext (#3629)
-  * Implement the file edit and view history. Default shortcut is alt-shift-e (#2733)
-  * Enable subshell in standalone mceditor, mcviewer, and mcdiffviewer (#3380)
-  * Refactoring of SIGWINCH handling (#117, #4019)
-  * Prevent run/open files with double right click (#4016)
-  * Improve support of Windows 1251 encoding on Solaris (#3992)
-  * Support binary reproducible builds (via --disable-configure-args configure option) (#4031)
+    * Drop bundled gettext (#3629)
+    * Implement the file edit and view history. Default shortcut is alt-shift-e (#2733)
+    * Enable subshell in standalone mceditor, mcviewer, and mcdiffviewer (#3380)
+    * Refactoring of SIGWINCH handling (#117, #4019)
+    * Prevent run/open files with double right click (#4016)
+    * Improve support of Windows 1251 encoding on Solaris (#3992)
+    * Support binary reproducible builds (via --disable-configure-args configure option) (#4031)
 
 - VFS
 
-  * sftpfs: support keyborad interactive authentication (#3921)
-  * uc1541 extfs: update up to 3.3 version (#3936)
+    * sftpfs: support keyborad interactive authentication (#3921)
+    * uc1541 extfs: update up to 3.3 version (#3936)
 
 - Editor
 
-  * Syntax:
-    * add yabasic (Yet Another BASIC) syntax highlighting (#4005)
-    * improve YAML syntax highlighting (#4010)
-    * add "https://" to Debian sources.list syntax (#4018)
-    * add .desktop files (#4022)
-    * improve RPM spec file syntax highlighting (#4037)
-    * improve Debian sources.list syntax highlighting (#4041)
+    * Syntax:
+        - add yabasic (Yet Another BASIC) syntax highlighting (#4005)
+        - improve YAML syntax highlighting (#4010)
+        - add "https://" to Debian sources.list syntax (#4018)
+        - add .desktop files (#4022)
+        - improve RPM spec file syntax highlighting (#4037)
+        - improve Debian sources.list syntax highlighting (#4041)
 
 - Misc
 
-  * Code cleanup (#3997, #4030, #4038, #4039)
-  * menu.mc: handle symbolic links to compressed archives (#4009)
-  * File highlighting updates (#4015)
-    * part - partial files, e.g. used by many download managers ([temp])
-    * apk - Android packages, deb - Debian packages ([archive])
-    * ts - MPEG-TS streams ([media])
-  * New skins:
-    * julia256: a dark skin with calm colors and good contrast.
+    * Code cleanup (#3997, #4030, #4038, #4039)
+    * menu.mc: handle symbolic links to compressed archives (#4009)
+    * File highlighting updates (#4015)
+        - part - partial files, e.g. used by many download managers ([temp])
+        - apk - Android packages, deb - Debian packages ([archive])
+        - ts - MPEG-TS streams ([media])
+    * New skins:
+        - julia256: a dark skin with calm colors and good contrast.
 
 - Fixes
 
-  * Compile failure on AIX 7.2 (#4033)
-  * Compile failure on OS X 10.9 (#4035)
-  * Enter key works as Down one in menu (#4006)
-  * Menubar: incorrect mouse click coordinate (#4013)
-  * Rotating dash generates way too much output (#3859)
-  * Totals aren't computed before move of a single directory (#4027)
-  * Editor: unusable dynamic paragraphing (#3996)
-  * VFS: iso9660 does not report listing errors (#3993)
-  * VFS: extfs: nested archives are not removed from temporary directory (#4000)
+    * Compile failure on AIX 7.2 (#4033)
+    * Compile failure on OS X 10.9 (#4035)
+    * Enter key works as Down one in menu (#4006)
+    * Menubar: incorrect mouse click coordinate (#4013)
+    * Rotating dash generates way too much output (#3859)
+    * Totals aren't computed before move of a single directory (#4027)
+    * Editor: unusable dynamic paragraphing (#3996)
+    * VFS: iso9660 does not report listing errors (#3993)
+    * VFS: extfs: nested archives are not removed from temporary directory (#4000)
 
 
 Version 4.8.23

+ 1 - 1
lib/charsets.c

@@ -1,7 +1,7 @@
 /*
    Text conversion from one charset to another.
 
-   Copyright (C) 2001-2019
+   Copyright (C) 2001-2020
    Free Software Foundation, Inc.
 
    Written by:

+ 1 - 1
lib/event/event.c

@@ -2,7 +2,7 @@
    Handle  events in application.
    Interface functions: init/deinit; start/stop
 
-   Copyright (C) 2011-2019
+   Copyright (C) 2011-2020
    Free Software Foundation, Inc.
 
    Written by:

+ 1 - 1
lib/event/manage.c

@@ -2,7 +2,7 @@
    Handle any events in application.
    Manage events: add, delete, destroy, search
 
-   Copyright (C) 2011-2019
+   Copyright (C) 2011-2020
    Free Software Foundation, Inc.
 
    Written by:

+ 1 - 1
lib/event/raise.c

@@ -2,7 +2,7 @@
    Handle any events in application.
    Raise events.
 
-   Copyright (C) 2011-2019
+   Copyright (C) 2011-2020
    Free Software Foundation, Inc.
 
    Written by:

+ 1 - 1
lib/filehighlight/common.c

@@ -2,7 +2,7 @@
    File highlight plugin.
    Interface functions
 
-   Copyright (C) 2009-2019
+   Copyright (C) 2009-2020
    Free Software Foundation, Inc.
 
    Written by:

+ 1 - 1
lib/filehighlight/get-color.c

@@ -2,7 +2,7 @@
    File highlight plugin.
    Interface functions. get color pair index for highlighted file.
 
-   Copyright (C) 2009-2019
+   Copyright (C) 2009-2020
    Free Software Foundation, Inc.
 
    Written by:

+ 1 - 1
lib/filehighlight/ini-file-read.c

@@ -2,7 +2,7 @@
    File highlight plugin.
    Reading and parse rules from ini-files
 
-   Copyright (C) 2009-2019
+   Copyright (C) 2009-2020
    Free Software Foundation, Inc.
 
    Written by:

Some files were not shown because too many files changed in this diff