The following commit has been merged in the master branch:
commit fb745c77ff7636cfb2eedbac929679f06adbf28b
Merge: 0434e3de5d20323bed8b7b2dbff74c1d00a221ec 
b1641d2540b992b0b614d613f97b042794c1eaae
Author: Enrico Weigelt, metux IT service <weig...@metux.de>
Date:   Mon Feb 2 20:58:55 2009 +0100

    manually merged 193_vhdl_syntax

diff --combined ChangeLog
index 3b5bab1,c9d846b..f111f15
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,6 +1,24 @@@
 -2009-01-30 Enrico Weigelt, metux IT service <weig...@metux.de>
 +2009-02-01 Enrico Weigelt, metux ITS <weig...@metux.de>
  
 -      * syntax/Syntax, syntax/Makefile.am, syntax/vhdl.syntax: added VHDL 
syntax
 +      * 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)
 +
 +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>
 +
 +      * edit/editcmd.c, mhl/escape.h, mhl/string.h, mhl/types.h, 
src/Makefile.am,
 +      * src/boxes.c, src/command.c, src/complete.c, src/complete.h, 
src/file.c,
 +      * src/find.c, src/main.c, src/panelize.c, src/util.c, src/utilunix.c,
 +      * src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
 +        fixed shell escaping issues in commandline completion engine
- 
- 2009-01-31 Enrico Weigelt, metux ITS <weig...@metux.de>
- 
 +      * replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in 
mhl/string.h)
 +      * replaced g_snprintf() by snprintf()
 +
 +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)
  
  2009-01-29 Mikhail S. Pobolovets <styx...@gmail.com>
        * lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
@@@ -32,13 -12,8 +30,10 @@@
          This solves "strange" rename cases, when copying/moving is performed 
into
          deleted directory.
  
 -2009-01-27 Enrico Weigelt, metux IT service <weig...@metux.de>
 +2009-01-27 Enrico Weigelt, metux ITS <weig...@metux.de>
  
 +      * mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type 
 +        SHELL_ESCAPED_STR for more type safety
- 
- 2009-01-27 Enrico Weigelt, metux IT service <weig...@metux.de>
- 
        * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
  2009-01-27 Sergei Trofimovich  <sly...@inbox.ru>
@@@ -46,11 -21,6 +41,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:
@@@ -66,7 -36,7 +61,7 @@@
        * 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 <weig...@metux.de>
++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: 
@@@ -75,9 -45,9 +70,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>
  
@@@ -85,11 -55,11 +82,6 @@@
          - 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>
--
--      * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
--        for Nemerle source files
--
  2009-01-19 Patrick Winnertz <win...@debian.org>
  
        * edit/edit.h: Add two more ints
@@@ -104,7 -74,7 +96,7 @@@
        * 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)
@@@ -142,9 -112,9 +134,6 @@@
        * 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)
--
--2009-01-10  Enrico Weigelt, metux ITS <weig...@metux.de>
--
        * 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:

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

Reply via email to