The following commit has been merged in the master branch:
commit 584caa79497b3672624d2b5f913fa56198f4a930
Merge: d3d1ff4faad9eda04663fde83666b6237727cb39 
adbe38172de077ce943e3de81a954bd7e2fa1b5e
Author: Enrico Weigelt, metux IT service <weig...@metux.de>
Date:   Wed Feb 4 01:26:28 2009 +0100

    manually merged mc-4.6

diff --combined ChangeLog
index 696a1af,2421f92..45c9f35
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,12 @@@
  2009-02-04 Enrico Weigelt, metux ITS <weig...@metux.de>
  
 -      * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#240)
 +      * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing 
#239, #240)
  
  2009-02-03 Enrico Weigelt, metux ITS <weig...@metux.de>
  
        * lib/mc.lib: added patch on #219 by angel_il
 +      * edit/editcmd.c, configure.ac: removed obsolete own implementation of 
memove (#242)
+       * vfs/extfs/u7z: patch from mandriva (#194)
  
  2009-02-01 Enrico Weigelt, metux ITS <weig...@metux.de>
  
@@@ -15,7 -15,6 +16,7 @@@
        * src/util.c: fixed name_trunc() on NULL or empty parameters
        * src/achown.c: fixed unitialized var in init_chown_advanced()
          (patch from andrew_b)
 +      * replaced gboolean by bool (from mhl/types.h)
  
  2009-01-31 Enrico Weigelt, metux ITS <weig...@metux.de>, Patrick Winnertz 
<win...@debian.org>, Slava Zanko <slavaza...@gmail.com>, Sergei Trofimovich  
<sly...@inbox.ru>
  
@@@ -25,22 -24,13 +26,22 @@@
        * src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
          fixed shell escaping issues in commandline completion engine
        * replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
 +      * replaced g_snprintf() by snprintf()
 +      * replaced GString stuff by static buffers
  
  2009-01-30 Enrico Weigelt, metux ITS <weig...@metux.de>
  
        * src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
          (out-of-tree builds)
 +      * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax (#193)
 +      * replaced calls to g_strdup() by mhl_str_dup()
 +
 +2009-01-30 Enrico Weigelt, metux ITS <weig...@metux.de>
 +
 +      * replaced calls to g_free() by mhl_mem_free()
  
  2009-01-29 Mikhail S. Pobolovets <styx...@gmail.com>
 +
        * lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
          odt2txt is now used
  
@@@ -61,11 -51,6 +62,11 @@@
        * syntax/python.syntax: Added syntax highlighting for
        pytnoh-2.6+ keywords (patch sent by NNemec)
  
 +2009-01-26 Mikhail S. Pobolovets <styx...@gmail.com>
 +
 +      * vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
 +        0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
 +
  2009-01-25 Ilia Maslakov <il.sm...@gmail.com>
  
        * src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -77,11 -62,7 +78,11 @@@
        * mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish 
code
          so that symlinks and files which special characters works now
  
 -2009-01-25 Enrico Weigelt <weig...@metux.de>
 +2009-01-25 Mikhail S. Pobolovets <styx...@gmail.com>
 +      * src/cmd.c src/option.c src/setup.c src/main.h: Automatic new 
directory(Mkdir, F7)
 +        name filling. Can be configured (on|off) in 'Configure options'
 +
 +2009-01-25 Enrico Weigelt, metux ITS <weig...@metux.de>
  
        * edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
        * src/hotlist.c, src/panelize.c, src/tree.c, src/user.c: 
@@@ -90,11 -71,9 +91,11 @@@
          translated strings. This breaks now once every history file
          but afterwards this will be stable
  
 -2009-01-24 Enrico Weigelt <weig...@metux.de>
 +2009-01-24 Enrico Weigelt, metux ITS <weig...@metux.de>
  
        * src/cmd.c: fixed bug #35 (do_view_cmd is now calling repaint_screen())
 +      * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +        for Nemerle source files
  
  2009-01-24 Patrick Winnertz <win...@debian.org>
  
@@@ -102,32 -81,17 +103,32 @@@
          - prevent . to match a newline (\n)
          - match from start of line and not from cursor position
  
 +2009-01-24 Enrico Weigelt, metux IT service <weig...@metux.de>
 +
 +      * configure.ac:
 +      * lib/mc.ext.in:
 +      * vfs/extfs/Makefile.am:
 +      * vfs/extfs/extfs.ini: 
 +      * vfs/extfs/uace.in:
 +      * vfs/extfs/uarc.in:
 +      * vfs/extfs/uc1541.in: added support for historic archive formats
 +        (patch provided by jpelletier)
 +
 +2009-01-19 Patrick Winnertz <win...@debian.org>
 +
 +      * edit/edit.h: Add two more ints
 +      * src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz <win...@debian.org>
  
 -      * edit/editdraw.c: Moved var into if clause as it's only used
 -      there
 +      * edit/editdraw.c: Moved var into if clause as it's only used there
        * edit/editlock.c: Removed unnecessary arguement to if condition
        * src/cmd.c: Removed unused pointer
        * src/hotlist.c: Removed unused function save_group
        * src/main.c: Removed unused function do_mc_filename_rename
        * src/util.c: Removed unused struct whentm
  
 -2009-01-16 Enrico Weigelt, metux IT service <weig...@metux.de>
 +2009-01-16 Enrico Weigelt, metux ITS <weig...@metux.de>
  
        * src/subshell: setting subshell pty to close-on-exec 
          (taken from mandriva patches)
@@@ -158,26 -122,7 +159,26 @@@
  2009-01-11 Patrick Winnertz <win...@debian.org>
  
        * syntax/pascal.syntax: Added syntax highlighting for 
 -      some delphi keywords
 +        some delphi keywords
 +
 +2009-01-10  Enrico Weigelt, metux ITS <weig...@metux.de>
 +
 +      * syntax/Makefile.am syntax/Syntax syntax/haskell.syntax:
 +      added syntax definition for Haskell (taken from rhclub-tree)
 +      * syntax: added ebuild Syntax defition (taken from rhclub-tree)
 +      * edit/editcmd.c:
 +      * src/achown.c src/background.c src/boxes.c src/chmod.c:
 +      * src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c:
 +      * src/ext.c src/file.c src/filegui.c src/find.c src/help.c:
 +      * src/learn.c src/main.c src/panelize.c src/screen.c:
 +      * src/selcodepage.c src/subshell.c src/tree.c src/user.c:
 +      * src/utilunix.c src/view.c:
 +      * vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c:
 +      * vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c:
 +      * vfs/utilvfs.c vfs/vfs.c:
 +      
 +      Changed message type codes on calls to message(), query_dialog(),
 +      close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL
  
  2008-12-18  Roland Illig  <roland.il...@gmx.de>
  
@@@ -355,7 -300,7 +356,7 @@@
  
        * doc/mc.1.in: Document `fish_directory_timeout'.
  
 -2006-02-18  David Martin  <<dmart...@excite.com>
 +2006-02-18  David Martin  <dmart...@excite.com>
  
        * doc/es/mc.1.in: Cleanup. Fix key naming.
  

-- 
Midnight Commander Development
_______________________________________________
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel

Reply via email to