The following commit has been merged in the master branch:
commit be982505ccc12065ee2ffe041c88107cd6b3041c
Merge: 9b9cab58749217101ab16504a77efb301812cfbf
03ec5ef5747da4f4b2913313fe6527491db330f2
Author: Enrico Weigelt, metux IT service <weig...@metux.de>
Date: Wed Feb 4 00:30:57 2009 +0100
Merge commit 'origin/mc-4.6'
diff --combined ChangeLog
index 832520c,074fc58..1bf1589
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,11 +1,12 @@@
2009-02-01 Enrico Weigelt, metux ITS <weig...@metux.de>
+ * acinclude.m4: removed MC_SLANG_PRIVATE macro
+ * src/slint.c: removed HAVE_SLANG_PRIVATE conditional and
+ replaced SLang_getkey2(), SLang_input_pending2()
* 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>
@@@ -12,23 -14,17 +15,23 @@@
* src/find.c, src/main.c, src/panelize.c, src/util.c, src/utilunix.c,
* src/widget.c, src/widget.h, src/wtools.c, vfs/fish.c:
fixed shell escaping issues in commandline completion engine
-
-2009-01-31 Enrico Weigelt, metux ITS <weig...@metux.de>
-
* 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
@@@ -42,6 -38,9 +45,6 @@@
* mhl/escape.h, src/complete.c, vfs/fish.c: introduced new type
SHELL_ESCAPED_STR for more type safety
-
-2009-01-27 Enrico Weigelt, metux IT service <weig...@metux.de>
-
* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
2009-01-27 Sergei Trofimovich <sly...@inbox.ru>
@@@ -49,11 -48,6 +52,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:
@@@ -65,11 -59,7 +68,11 @@@
* 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 Enrico Weigelt <weig...@metux.de>
+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:
* src/hotlist.c, src/panelize.c, src/tree.c, src/user.c:
@@@ -78,11 -68,9 +81,11 @@@
translated strings. This breaks now once every history file
but afterwards this will be stable
-2009-01-24 Enrico Weigelt <weig...@metux.de>
+2009-01-24 Enrico Weigelt, metux ITS <weig...@metux.de>
* 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>
@@@ -90,21 -78,17 +93,21 @@@
- prevent . to match a newline (\n)
- match from start of line and not from cursor position
+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)
@@@ -135,26 -119,7 +138,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>
@@@ -332,7 -297,7 +335,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 16fc3d2,cf87322..8e03084
--- a/src/slint.c
+++ b/src/slint.c
@@@ -77,66 -77,6 +77,6 @@@ 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)
@@@ -253,10 -193,10 +193,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);
@@@ -465,10 -405,10 +405,10 @@@ getch (void
{
int c;
if (no_slang_delay)
- if (SLang_input_pending2 (0) == 0)
+ if (SLang_input_pending (0) == 0)
return -1;
- c = SLang_getkey2 ();
+ c = SLang_getkey ();
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
