The following commit has been merged in the master branch:
commit 220f4f4cafb2a75fe9d9472cc93825fe986edd97
Merge: 41f06e42b143cb30256ded26923d8c7cf5d5e312
161dc235a618c33bda49dbd84295406d5273fb70
Author: Enrico Weigelt, metux IT service <weig...@metux.de>
Date: Thu Feb 5 07:25:47 2009 +0100
manually merged mc-4.6
diff --combined ChangeLog
index 92a95df,74b6e0f..82eca35
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,22 -1,21 +1,20 @@@
2009-02-04 Enrico Weigelt, metux ITS <weig...@metux.de>
+ * mhl/types.h, mhl/escape.h: replaced bool type by stdbool.h (fixing
#239, #240)
+ * lib/mc.sh.in: fixes for non-bash shells (fixing #196)
2009-02-03 Enrico Weigelt, metux ITS <weig...@metux.de>
* lib/mc.lib: added patch on #219 by angel_il
+ * edit/editcmd.c, configure.ac: removed obsolete own implementation of
memove (#242)
* vfs/extfs/u7z: patch from mandriva (#194)
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)
+ * replaced gboolean by bool (from mhl/types.h)
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>
@@@ -26,22 -25,13 +24,22 @@@
* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
fixed shell escaping issues in commandline completion engine
* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in
mhl/string.h)
+ * replaced g_snprintf() by snprintf()
+ * replaced GString stuff by static buffers
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)
+ * replaced calls to g_strdup() by mhl_str_dup()
+
+2009-01-30 Enrico Weigelt, metux ITS <weig...@metux.de>
+
+ * replaced calls to g_free() by mhl_mem_free()
2009-01-29 Mikhail S. Pobolovets <styx...@gmail.com>
+
* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
odt2txt is now used
@@@ -62,11 -52,6 +60,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:
@@@ -78,10 -63,6 +76,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, metux ITS <weig...@metux.de>
* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:
@@@ -91,12 -72,10 +89,12 @@@
translated strings. This breaks now once every history file
but afterwards this will be stable
-2009-01-24 Enrico Weigelt, metux IT service <weig...@metux.de>
+2009-01-24 Enrico Weigelt, metux ITS <weig...@metux.de>
* vfs/extfs/rpm, vfs/extfs/trpm: removed obsolete rpm tags
* 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>
@@@ -104,32 -83,17 +102,32 @@@
- 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>
+
+ * configure.ac:
+ * lib/mc.ext.in:
+ * vfs/extfs/Makefile.am:
+ * vfs/extfs/extfs.ini:
+ * vfs/extfs/uace.in:
+ * vfs/extfs/uarc.in:
+ * vfs/extfs/uc1541.in: added support for historic archive formats
+ (patch provided by jpelletier)
+
+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
* 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)
@@@ -160,26 -124,7 +158,26 @@@
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)
+ * 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>
@@@ -357,7 -302,7 +355,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/slint.c
index 8e03084,c30fac1..16fc3d2
--- a/src/slint.c
+++ b/src/slint.c
@@@ -77,6 -77,66 +77,66 @@@ static int no_slang_delay
/* Forward declarations */
static void load_terminfo_keys (void);
+ #ifndef HAVE_SLANG_PRIVATE
+ /* Private interfaces have been stripped, so we cannot use them */
+ #define SLang_getkey2() SLang_getkey()
+ #define SLang_input_pending2(s) SLang_input_pending(s)
+ #else
+ /* Copied from ../slang/slgetkey.c, removed the DEC_8Bit_HACK. */
+ extern unsigned char SLang_Input_Buffer [];
+ #if SLANG_VERSION >= 10000
+ extern unsigned int _SLsys_getkey (void);
+ extern int _SLsys_input_pending (int);
+ #else
+ extern unsigned int SLsys_getkey (void);
+ extern int SLsys_input_pending (int);
+ #endif
+
+ static unsigned int SLang_getkey2 (void)
+ {
+ unsigned int imax;
+ unsigned int ch;
+
+ if (SLang_Input_Buffer_Len)
+ {
+ ch = (unsigned int) *SLang_Input_Buffer;
+ SLang_Input_Buffer_Len--;
+ imax = SLang_Input_Buffer_Len;
+
+ memmove ((char *) SLang_Input_Buffer,
+ (char *) (SLang_Input_Buffer + 1), imax);
+ return(ch);
+ }
+ #if SLANG_VERSION >= 10000
+ else return(_SLsys_getkey ());
+ #else
+ else return(SLsys_getkey());
+ #endif
+ }
+
+ static int SLang_input_pending2 (int tsecs)
+ {
+ int n, i;
+ unsigned char c;
+
+ if (SLang_Input_Buffer_Len) return (int) SLang_Input_Buffer_Len;
+ #if SLANG_VERSION >= 10000
+ n = _SLsys_input_pending (tsecs);
+ #else
+ n = SLsys_input_pending (tsecs);
+ #endif
+ if (n <= 0) return 0;
+
+ i = SLang_getkey2 ();
+ if (i == SLANG_GETKEY_ERROR)
+ return 0; /* don't put crippled error codes into the input buffer */
+ c = (unsigned char)i;
+ SLang_ungetkey_string (&c, 1);
+
+ return n;
+ }
+ #endif /* HAVE_SLANG_PRIVATE */
+
/* Only done the first time */
void
slang_init (void)
@@@ -193,10 -253,10 +253,10 @@@ slang_reset_softkeys (void
char tmp[BUF_SMALL];
for (key = 1; key < 9; key++) {
- g_snprintf (tmp, sizeof (tmp), "k%d", key);
+ snprintf (tmp, sizeof (tmp), "k%d", key);
send = (char *) SLtt_tgetstr (tmp);
if (send) {
- g_snprintf (tmp, sizeof (tmp), "\033&f%dk%dd%dL%s%s", key,
+ snprintf (tmp, sizeof (tmp), "\033&f%dk%dd%dL%s%s", key,
(int) (sizeof (display) - 1), (int) strlen (send),
display, send);
SLtt_write_string (tmp);
@@@ -405,10 -465,10 +465,10 @@@ getch (void
{
int c;
if (no_slang_delay)
- if (SLang_input_pending (0) == 0)
+ if (SLang_input_pending2 (0) == 0)
return -1;
- c = SLang_getkey ();
+ c = SLang_getkey2 ();
if (c == SLANG_GETKEY_ERROR) {
fprintf (stderr,
"SLang_getkey returned SLANG_GETKEY_ERROR\n"
--
Midnight Commander Development
_______________________________________________
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
