The following commit has been merged in the master branch:
commit 3410eb32290abe51e6845483ed7a3723823a768a
Merge: 74c5601339ac49b1ca6647ffc867c384b1355a14
48a85a7b97ea88f7687126471c2a724e3e444619
Author: Enrico Weigelt, metux IT service <weig...@metux.de>
Date: Sun Feb 1 22:38:48 2009 +0100
Merge commit 'origin/mc-4.6'
diff --combined ChangeLog
index c6733e2,ed3c7f6..2c39360
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,7 @@@
2009-02-01 Enrico Weigelt, metux ITS <weig...@metux.de>
* 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>
@@@ -44,11 -45,6 +45,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:
@@@ -60,10 -56,6 +61,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...@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 <weig...@metux.de>
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -83,19 -75,10 +84,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 <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
+ * 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
@@@ -133,29 -116,7 +134,29 @@@
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)
+
+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:
+ * 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>
@@@ -333,7 -294,7 +334,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.
diff --combined src/achown.c
index 8f436fb,6277110..de2ae07
--- a/src/achown.c
+++ b/src/achown.c
@@@ -539,9 -539,9 +539,9 @@@ init_chown_advanced (void
int i;
enum { dlg_h = 13, dlg_w = 74, n_elem = 4 };
#ifdef ENABLE_NLS
- static int i18n_len;
-
- if (!i18n_len) {
+ static int i18n_len = 0;
+
+ if (i18n_len == 0) {
int dx, cx;
for (i = 0 ; i < n_elem ; i++) {
chown_advanced_but[i].text = _(chown_advanced_but[i].text);
@@@ -627,12 -627,12 +627,12 @@@ static void apply_advanced_chowns (stru
fname = current_panel->dir.list[current_file].fname;
need_update = end_chown = 1;
if (mc_chmod (fname, get_mode ()) == -1)
- message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+ message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
fname, unix_error_string (errno));
/* call mc_chown only, if mc_chmod didn't fail */
else if (mc_chown (fname, (ch_flags[9] == '+') ? sf->st_uid : (uid_t) -1,
(ch_flags[10] == '+') ? sf->st_gid : (gid_t) -1) == -1)
- message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+ message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
fname, unix_error_string (errno));
do_file_mark (current_panel, current_file, 0);
@@@ -643,12 -643,12 +643,12 @@@
break;
ch_cmode = sf->st_mode;
if (mc_chmod (fname, get_mode ()) == -1)
- message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+ message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
fname, unix_error_string (errno));
/* call mc_chown only, if mc_chmod didn't fail */
else if (mc_chown (fname, (ch_flags[9] == '+') ? a_uid : (uid_t) -1,
(ch_flags[10] == '+') ? a_gid : (gid_t) -1) == -1)
- message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+ message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
fname, unix_error_string (errno));
do_file_mark (current_panel, current_file, 0);
@@@ -690,12 -690,12 +690,12 @@@ chown_advanced_cmd (void
case B_ENTER:
need_update = 1;
if (mc_chmod (fname, get_mode ()) == -1)
- message (1, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
+ message (D_ERROR, MSG_ERROR, _(" Cannot chmod \"%s\" \n %s "),
fname, unix_error_string (errno));
/* call mc_chown only, if mc_chmod didn't fail */
else if (mc_chown (fname, (ch_flags[9] == '+') ? sf_stat->st_uid :
(uid_t) -1,
(ch_flags[10] == '+') ? sf_stat->st_gid :
(gid_t) -1) == -1)
- message (1, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
+ message (D_ERROR, MSG_ERROR, _(" Cannot chown \"%s\" \n %s "),
fname, unix_error_string (errno));
break;
case B_SETALL:
--
Midnight Commander Development
_______________________________________________
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
