The following commit has been merged in the master branch:
commit cad6ffd2bb47beb653e574d69d539fc6b9ffaaf9
Merge: e34e748666c0ad817013a5e8044cd1cba11f8e48
bef72946fd79f788b2eb693e9f314bbdf449c04e
Author: Patrick Winnertz <win...@debian.org>
Date: Tue Jan 27 23:03:06 2009 +0100
Merge branch 'mc-4.6'
diff --combined src/main.c
index 68c9988,f323905..6ba72e0
--- a/src/main.c
+++ b/src/main.c
@@@ -425,7 -425,7 +425,7 @@@ voi
do_possible_cd (const char *new_dir)
{
if (!do_cd (new_dir, cd_exact))
- message (1, _("Warning"),
+ message (D_ERROR, _("Warning"),
_(" The Commander can't change to the directory that \n"
" the subshell claims you are in. Perhaps you have \n"
" deleted your working directory, or given yourself \n"
@@@ -471,7 -471,7 +471,7 @@@ quit_cmd_internal (int quiet
} else {
if (query_dialog
(_(" The Midnight Commander "),
- _(" Do you really want to quit the Midnight Commander? "), 0,
+ _(" Do you really want to quit the Midnight Commander? "),
D_NORMAL,
2, _("&Yes"), _("&No")) == 0)
q = 1;
}
@@@ -686,7 -686,7 +686,7 @@@ directory_history_list (WPanel *panel
if (_do_panel_cd (panel, s, cd_exact))
directory_history_add (panel, panel->cwd);
else
- message (1, MSG_ERROR, _("Cannot change directory"));
+ message (D_ERROR, MSG_ERROR, _("Cannot change directory"));
g_free (s);
}
@@@ -993,7 -993,7 +993,7 @@@ toggle_fast_reload (void
{
fast_reload = !fast_reload;
if (fast_reload_w == 0 && fast_reload) {
- message (0, _(" Information "),
+ message (D_NORMAL, _(" Information "),
_
(" Using the fast reload option may not reflect the exact \n"
" directory contents. In this case you'll need to do a \n"
@@@ -1617,6 -1617,8 +1617,8 @@@ update_xterm_title_path (void
if (!is_printable ((unsigned char) *s))
*s = '?';
} while (*++s);
+ if (!alternate_plus_minus)
+ numeric_keypad_mode ();
fprintf (stdout, "\33]0;mc - %s\7", p);
fflush (stdout);
g_free (p);
--
Midnight Commander Development
_______________________________________________
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
