Skip to content

Commit

Permalink
Merge branch '3113_cleanup'
Browse files Browse the repository at this point in the history
* 3113_cleanup:
  From ticket #3116: attempt to fix segfault while passing messages to widgets.
  From ticket #3116: fix segfault in cpio VFS while reading corrupted RPM.
  From ticket #3116: fix possible segfault when freeing a VFS.
  Ticket #3151: lib/global.h: remove declaration of refresh_screen().
  Collapse list of copyright years to ranges. Add 2014 year.
  Ticket #3134: fix some inconsistencies in "Learn keys" UI.
  Ticket #3133: keypad '*' doesn't work with numlock off.
  Ticket #3132: exit without confirmation by default.
  (panel_operate): variable clean up.
  (move_dir_dir): variable clean up.
  src/filemanager/file.c: tweak indentation.
  doc/NEWS: cosmetics.
  src/editor/editbuffer.c: typo.
  Use symbolic names for standard file descriptors.
  (setup_cmdline): fixup of prompt truncation.
  Clarify --skin key in RU man page.
  Ticket #3073: clarify regex in urar helper.
  (panel_compute_totals): fix display of directory scanning statistics.
  Ticket #3113: code cleanup before 4.8.12 release.
  • Loading branch information
aborodin committed Feb 10, 2014
2 parents 1dcafad + 30ca8ef commit 25bc34a
Show file tree
Hide file tree
Showing 243 changed files with 368 additions and 447 deletions.
9 changes: 9 additions & 0 deletions doc/NEWS
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
Version 4.8.11

- Core

* Live update of panels size when editing layout (#3060)
* Support "Compute totals" option in move file operation (#2075)

- VFS

* rpm extfs
- show dependency version (#2812)
- support tar payload (#3064)
- improve support for EPOCH tag (#1588)
- add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG, VERIFYSCRIPTPROG and TRIGGERSCRIPTS/TRIGGERSCRIPTPROG tags (#1588)

- Editor

* Support "bracketed paste mode" of xterm (#2661)
* Clarify Java syntax highlighting (#3057)

- Misc

* Print warnings about unknown '--with-' / '--enable-' configure options (#3029)
* Code cleanup and refactoring (#3051, #3066)

- Fixes

* FTBFS on GNU Hurd (#3053, #3071)
* Segfault while moving files (#3059, #3105)
* Broken handling of mc command line arguments (#3047)
Expand All @@ -44,6 +49,7 @@ Version 4.8.11
* Bright colors are used as background colors in 16-color skins (#3050)
* Various defects in documentation (#3052, #3092)


Version 4.8.10

- Core
Expand All @@ -52,6 +58,7 @@ Version 4.8.10
* Behavior of the 'Right' key in the 'Directory hotlist' was changed: now 'Right' key is used only to enter into the group (#3045)

- Misc

* Code cleanup (#3035)

- Fixes
Expand All @@ -65,6 +72,7 @@ Version 4.8.10
* mcedit: paragraph format doesn't respect multibyte characters (#2713)
* Crash after entering a wrong SFTP password (#3036)


Version 4.8.9

- VFS
Expand Down Expand Up @@ -207,6 +215,7 @@ Version 4.8.7
Version 4.8.6

- Fixes

* mcedit: two-columns extra offset of cursor after tab character (#2881)
* diffviewer: cannot open file if name contains '$' (#2873)

Expand Down
2 changes: 1 addition & 1 deletion doc/man/ru/mc.1.in
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ Commander.
псевдографических символов (в том числе в меню и экранах помощи) и
отключается вывод дополнительных (избыточных) сообщений.
.TP
.I \-S arg, \-\-skin
.I \-S arg, \-\-skin=arg
Используется для того, чтобы задать другой скин в командной
строке. Технология скинов описана в разделе
.\"LINK2"
Expand Down
2 changes: 1 addition & 1 deletion lib/charsets.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Text conversion from one charset to another.
Copyright (C) 2001, 2011
Copyright (C) 2001-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/event/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Handle events in application.
Interface functions: init/deinit; start/stop
Copyright (C) 2011
Copyright (C) 2011-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/event/manage.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Handle any events in application.
Manage events: add, delete, destroy, search
Copyright (C) 2011
Copyright (C) 2011-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/event/raise.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Handle any events in application.
Raise events.
Copyright (C) 2011
Copyright (C) 2011-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/filehighlight/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
File highlight plugin.
Interface functions
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/filehighlight/get-color.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
File highlight plugin.
Interface functions. get color pair index for highlighted file.
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/filehighlight/ini-file-read.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
File highlight plugin.
Reading and parse rules from ini-files
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/glibcompat.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
GLIB - Library of useful routines for C programming
Copyright (C) 2009, 2011, 2013
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/global.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Global structure for some library-related variables
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 0 additions & 2 deletions lib/global.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,5 @@ extern mc_global_t mc_global;

/*** declarations of public functions ************************************************************/

void refresh_screen (void *);

/*** inline functions ****************************************************************************/
#endif
3 changes: 1 addition & 2 deletions lib/hook.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
Slavaz: Warning! this file is deprecated and should be replaced
by mcevents functional.
Copyright (C) 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
2004, 2005, 2007, 2009, 2010, 2011
Copyright (C) 1994-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/keybind.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Definitions of key bindings.
Copyright (C) 2005, 2009, 2010, 2011, 2011, 2012
Copyright (C) 2005-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/lock.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
File locking
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2011
Copyright (C) 2003-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/logging.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Provides a log file to ease tracing the program.
Copyright (C) 2006, 2009, 2011
Copyright (C) 2006-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
3 changes: 1 addition & 2 deletions lib/mcconfig/common.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*
Configure module for the Midnight Commander
Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2009, 2011
Copyright (C) 1994-2014
The Free Software Foundation, Inc.
This file is part of the Midnight Commander.
Expand Down
3 changes: 1 addition & 2 deletions lib/mcconfig/get.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*
Configure module for the Midnight Commander
Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2009, 2011
Copyright (C) 1994-2014
The Free Software Foundation, Inc.
This file is part of the Midnight Commander.
Expand Down
2 changes: 1 addition & 1 deletion lib/mcconfig/paths.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
paths to configuration files
Copyright (C) 2010, 2011
Copyright (C) 2010-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
3 changes: 1 addition & 2 deletions lib/mcconfig/set.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*
Configure module for the Midnight Commander
Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
2007, 2009, 2011
Copyright (C) 1994-2014
The Free Software Foundation, Inc.
This file is part of the Midnight Commander.
Expand Down
2 changes: 1 addition & 1 deletion lib/search/glob.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Search text engine.
Glob-style pattern matching
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/search/hex.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Search text engine.
HEX-style pattern matching
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/search/lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Search text engine.
Common share code for module.
Copyright (C) 2009, 2011, 2013
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/search/normal.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Search text engine.
Plain search
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/search/regex.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Search text engine.
Regex search
Copyright (C) 2009, 2011, 2013
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/search/search.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Search text engine.
Interface functions
Copyright (C) 2009, 2011, 2013
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/serialize.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Provides a serialize/unserialize functionality for INI-like formats.
Copyright (C) 2011
Copyright (C) 2011-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/skin/colors-old.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skins engine.
Work with colors - backward compatibility
Copyright (C) 2009, 2010, 2011, 2012
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/skin/colors.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skins engine.
Work with colors
Copyright (C) 2009, 2010, 2011, 2012
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/skin/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skins engine.
Interface functions
Copyright (C) 2009, 2010, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/skin/hc-skins.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skins engine.
Set of hardcoded skins
Copyright (C) 2009, 2011, 2012
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/skin/ini-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skins engine.
Reading and parse ini-files
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/skin/lines.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Skins engine.
Work with line draving chars.
Copyright (C) 2009, 2011
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/strutil/replace.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Functions for replacing substrings in strings.
Copyright (C) 2013
Copyright (C) 2013-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/strutil/strescape.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Functions for escaping and unescaping strings
Copyright (C) 2009, 2011, 2013
Copyright (C) 2009-2014
The Free Software Foundation, Inc.
Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/strutil/strutil.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Common strings utilities

Copyright (C) 2007, 2011, 2013
Copyright (C) 2007-2014
The Free Software Foundation, Inc.

Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/strutil/strutil8bit.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
8bit strings utilities

Copyright (C) 2007, 2011, 2013
Copyright (C) 2007-2014
The Free Software Foundation, Inc.

Written by:
Expand Down
2 changes: 1 addition & 1 deletion lib/strutil/strutilascii.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
ASCII strings utilities

Copyright (C) 2007, 2011, 2013
Copyright (C) 2007-2014
The Free Software Foundation, Inc.

Written by:
Expand Down
Loading

0 comments on commit 25bc34a

Please sign in to comment.