updated: [6c64add] Merge branch 'mc-4.6'

["Sergei Trofimovich" <slyfox inbox ru>]

The following commit has been merged in the master branch:
commit 6c64add7c1321fa0ded7459cd591bd1be5e80741
Merge: d5565fb6784407bdd0e5b02511440bb0eaad3b93 a59ccc10166d000aa26e5b50d089753e5aa4cf5d
Author: Sergei Trofimovich <slyfox inbox ru>
Date:   Thu Jan 29 20:05:03 2009 +0200

    Merge branch 'mc-4.6'
    
    * mc-4.6:
      changelog: added entry for python syntax
      syntax: python: keywords update (patch by NNemec) fixes #216

diff --combined ChangeLog
index bd24694,e1cfb07..78d4fe4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -8,6 -8,11 +8,11 @@@
  
  	* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
  
+ 2009-01-27 Sergei Trofimovich  <slyfox inbox ru>
+ 
+ 	* syntax/python.syntax: Added syntax highlighting for
+ 	pytnoh-2.6+ keywords (patch sent by NNemec)
+ 
  2009-01-25 Ilia Maslakov <il smind gmail com>
  
  	* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -19,10 -24,6 +24,10 @@@
  	* 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 Mikhail S. Pobolovets <styx mp 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 <weigelt metux de>
  
  	* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -42,19 -43,10 +47,19 @@@
  	  - prevent . to match a newline (\n)
  	  - match from start of line and not from cursor position
  
 +2009-01-24  Enrico Weigelt, metux IT service <weigelt metux de>
 +
 +	* syntax/Syntax, syntax/nemerle.syntax: Added syntax rules 
 +	  for Nemerle source files
 +
 +2009-01-19 Patrick Winnertz <winnie debian org>
 +
 +	* edit/edit.h: Add two more ints
 +	* src/setup.c: Add keybinding to disable tab highlighting
 +
  2009-01-18 Patrick Winnertz <winnie 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
@@@ -92,29 -84,7 +97,29 @@@
  2009-01-11 Patrick Winnertz <winnie debian org>
  
  	* syntax/pascal.syntax: Added syntax highlighting for 
 -	some delphi keywords
 +	  some delphi keywords
 +
 +2009-01-10  Enrico Weigelt, metux ITS <weigelt 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)
 +
 +2009-01-10  Enrico Weigelt, metux ITS <weigelt 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:
 +	* 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 illig gmx de>
  
@@@ -292,7 -262,7 +297,7 @@@
  
  	* doc/mc.1.in: Document `fish_directory_timeout'.
  
 -2006-02-18  David Martin  <<dmartina excite com>
 +2006-02-18  David Martin  <dmartina excite com>
  
  	* doc/es/mc.1.in: Cleanup. Fix key naming.
  

-- 
Midnight Commander Development