updated: [9175c6b] Merge branch 'mc-4.6'

["Sergei Trofimovich" <slyfox inbox ru>]

The following commit has been merged in the master branch:
commit 9175c6babdbc19e86b3d3e608c871676e13fb14a
Merge: abc295cee2f4098c745429ed8464907628b49386 1da3919eb1e30a1c364c4be15998e1ab0d5933bc
Author: Sergei Trofimovich <slyfox inbox ru>
Date:   Thu Jan 29 01:34:33 2009 +0200

    Merge branch 'mc-4.6'
    
    * mc-4.6:
      ChangeLog/NEWS: added entry for #181 ticket (copy to deleted dir)

diff --combined ChangeLog
index 9055511,4004ba8..7464ec2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,9 +1,9 @@@
+ 2009-01-29 Patrick Winnertz <winnie debian org> & Sergei Trofimovich  <slyfox inbox ru>
+ 
+ 	* src/file.c: Added trailing dir separator for default path in copy/move dialogs.
+ 	  This solves "strange" rename cases, when copying/moving is performed into
+ 	  deleted directory.
+ 
  2009-01-27 Enrico Weigelt, metux IT service <weigelt metux de>
  
  	* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
@@@ -32,19 -38,10 +38,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
@@@ -82,29 -79,7 +88,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>
  
@@@ -282,7 -257,7 +288,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