Commit Graph

454 Commits

Author SHA1 Message Date
Patrick Winnertz
e4e135399f Revert "replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()"
This reverts commit 54d6ec88dc.

Conflicts:

	ChangeLog
	mhl/string.h
	src/command.c
	src/complete.c
	src/util.c
2009-02-10 13:29:18 +01:00
Sergei Trofimovich
ff4de3d66f Merge branch 'mc-4.6' into 147_escaping
* mc-4.6:
  replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()
  fixed out-of-tree-builds
  Updated the NEWS file for 4.6.2 and added the bugnumbers behind the items in the list.
  Update for OpenOffice and StarOffice viewer.
  changelog: added entry for python syntax
  syntax: python: keywords update (patch by NNemec) fixes #216
  AC_USE_SYSTEM_EXTENSIONS macro requires autoconf >= 2.60
  po/ru.po: In russian translation, there are some hotkey conficts in menu.
  ChangeLog/NEWS: added entry for #181 ticket (copy to deleted dir)
  Now a trailing slash will only be added in copy & move dialogs if the path itselfs
  copy/move dialog: add trailing '/' to default destination path (fix #181)
  fixed comments to /* ... */
  Not only comment it out but removing it
  Removed unneeded var to make build process a bit cleaner
  Add code snipplet by il.smind which should fix issues with putty and

Conflicts:
	ChangeLog
	mhl/string.h
	src/command.c
	src/complete.c
	src/file.c
	src/util.c
2009-01-31 22:18:19 +02:00
Enrico Weigelt, metux IT service
54d6ec88dc replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() 2009-01-31 16:51:58 +01:00
Enrico Weigelt, metux IT service
e3a3890a3a fixed out-of-tree-builds 2009-01-30 16:46:44 +01:00
Enrico Weigelt, metux IT service
7639b364af added a new parameter for completion flags to input_new 2009-01-29 19:17:43 +01:00
Enrico Weigelt, metux IT service
0dcb057459 separated out history section names to history.h 2009-01-24 21:51:29 +01:00
Enrico Weigelt, metux IT service
b9b09436c4 Merge commit 'origin/50_history_section_names' into 50_history_sections.metux 2009-01-24 21:26:41 +01:00
Patrick Winnertz
786f68dd4f Merge branch '207_minor_regex_fixes' into mc-4.6 2009-01-24 13:17:28 +01:00
Patrick Winnertz
88c320822a Fix some smaller errors concerning regex searches in mcedit 2009-01-23 20:01:15 +01:00
Patrick Winnertz
b7ac1e0484 Applied patch from debian which fixes a test if a file can be opened. 2009-01-23 19:55:43 +01:00
Slava Zanko
22fada9ce0 History sections names:
Make names of sections with function name as prefix string.

for example:
[inp:mc_mkdir Enter directory name ]
0=...
2009-01-20 00:57:09 +02:00
Patrick Winnertz
537b55b46e Move this var into if condition as it's only needed there 2009-01-14 23:28:35 +01:00
Patrick Winnertz
a144f2e4f6 Apply patch to fix localised history headers to mc-4.6 branch.
This is bad as if the localised string changed or you start mc
in another language your history will be lost.
2009-01-14 01:01:18 +01:00
Patrick Winnertz
aed7edf0f6 Removed some unused vars and functions 2009-01-12 22:47:05 +01:00
Enrico Weigelt, metux IT service
8fef98a418 Merge commit 'origin/96_segfault_invalid_mtime' into mc-4.6 2009-01-11 22:07:25 +01:00
Patrick Winnertz
197973ccf2 Applied patch from metux on git - needed to fix some stuff manually.
This branch is based on mc-4.6
2009-01-10 11:53:20 +01:00
Slava Zanko
8ebe7873c9 in file edit/edit.[ch]
make function edit_cursor_move() to non-return (void).
2009-01-09 01:33:17 +02:00
Patrick Winnertz
6f8a3b3825 Add small patch which should fix the uninitialised warning 2009-01-08 23:05:30 +01:00
Patrick Winnertz
dcd57a34ef Removed .cvsignore files as we don't need them any longer 2009-01-05 16:58:44 +01:00
Slava Zanko
aad7c6c317 Added .svnignore files (same as .cvsignore) 2008-12-28 23:27:03 +02:00
Pavel Tsekov
b0f2d1654c * edit/editlock.c (lock_build_name): Check the return value of getpwuid().
* src/cmd.c (save_setup_cmd): Remove redundant g_strconcat() call.
* src/hotlist.c (load_hotlist): Likewise.
* vfs/smbfs.c (smbfs_convert_path): Replaced NULL with (char *) NULL.
2007-11-02 14:02:23 +00:00
Pavel Tsekov
2f3df3af4e * edit/bookmark.c: Update copyright notice.
* edit/edit.c: Likewise.
* edit/editcmd.c: Likewise.
* edit/editdraw.c: Likewise.
* edit/editkeys.c: Likewise.
* edit/editlock.c: Likewise.
* edit/editmenu.c: Likewise.
* edit/editoptions.c: Likewise.
* edit/editwidget.c: Likewise.
* edit/syntax.c: Likewise.
* src/background.c: Likewise.
* src/boxes.c: Likewise.
* src/complete.c: Likewise.
* src/execute.c: Likewise.
* src/ext.c: Likewise.
* src/file.c: Likewise.
* src/filegui.c: Likewise.
* src/fileopctx.c: Likewise.
* src/find.c: Likewise.
* src/hotlist.c: Likewise.
* src/key.c: Likewise.
* src/keyxdef.c: Likewise.
* src/layout.c: Likewise.
* src/learn.c: Likewise.
* src/listmode.c: Likewise.
* src/main.c: Likewise.
* src/panelize.c: Likewise.
* src/slint.c: Likewise.
* src/textconf.c: Likewise.
* src/tree.c: Likewise.
* src/treestore.c: Likewise.
* src/tty.c: Likewise.
* src/util.c: Likewise.
* src/utilunix.c: Likewise.
* src/view.c: Likewise.
* src/widget.c: Likewise.
* src/wtools.c: Likewise.
* src/x11conn.c: Likewise.
* vfs/cpio.c: Likewise.
* vfs/extfs.c: Likewise.
* vfs/fish.c: Likewise.
* vfs/ftpfs.c: Likewise.
* vfs/gc.c: Likewise.
* vfs/mcfs.c: Likewise.
* vfs/mcserv.c: Likewise.
* vfs/smbfs.c: Likewise.
* vfs/tar.c: Likewise.
2007-09-25 15:33:35 +00:00
Pavel Tsekov
23361694b6 * src/background.c: Use the correct form of FSF's name in the copyright
notice.
* src/boxes.c: Ditto.
* src/complete.c: Ditto.
* src/execute.c: Ditto.
* src/ext.c: Ditto.
* src/file.c: Ditto.
* src/filegui.c: Ditto.
* src/fileopctx.c: Ditto.
* src/fileopctx.h: Ditto.
* src/find.c: Ditto.
* src/hotlist.c: Ditto.
* src/key.c: Ditto.
* src/keyxdef.c: Ditto.
* src/layout.c: Ditto.
* src/learn.c: Ditto.
* src/listmode.c: Ditto.
* src/main.c: Ditto.
* src/panelize.c: Ditto.
* src/slint.c: Ditto.
* src/textconf.c: Ditto.
* src/tree.c: Ditto.
* src/treestore.c: Ditto.
* src/tty.c: Ditto.
* src/util.c: Ditto.
* src/utilunix.c: Ditto.
* src/view.c: Ditto.
* src/widget.c: Ditto.
* src/wtools.c: Ditto.
* src/x11conn.c: Ditto.
* vfs/cpio.c: Ditto.
* vfs/extfs.c: Ditto.
* vfs/fish.c: Ditto.
* vfs/ftpfs.c: Ditto.
* vfs/gc.c: Ditto.
* vfs/mcfs.c: Ditto.
* vfs/mcserv.c: Ditto.
* vfs/smbfs.c: Ditto.
* vfs/tar.c: Ditto.
* vfs/undelfs.c: Ditto.
* vfs/utilvfs.c: Ditto.
* vfs/vfs.c: Ditto.
* edit/bookmark.c: Ditto.
* edit/edit.c: Ditto.
* edit/edit.h: Ditto.
* edit/editcmd.c: Ditto.
* edit/editdraw.c: Ditto.
* edit/editkeys.c: Ditto.
* edit/editlock.c: Ditto.
* edit/editmenu.c: Ditto.
* edit/editoptions.c: Ditto.
* edit/editwidget.c: Ditto.
* edit/syntax.c: Ditto.
2007-09-24 09:28:32 +00:00
Pavel Tsekov
ca6af7ed40 * edit/choosesyntax.c (pstrcmp): Make static. 2007-09-11 08:34:31 +00:00
Pavel Tsekov
139e48183f * src/color.h: Add a new color pair.
* src/color.c: Likewise.
* edit/editdraw.c (print_to_widget): Make tabs and trailing whitespace
characters visible.
(edit_draw_this_line): Likewise.
2007-08-27 12:06:02 +00:00
Pavel Tsekov
46d039e0e1 * edit/editcmd.c (edit_find_string): Fix an off-by-one error when matching
against a RE.
2007-05-02 11:22:01 +00:00
Pavel Tsekov
fb01c26098 * edit/editcmd.c (edit_replace_cmd): Disable scanf-printf replacement
if "Regular expression" is selected. Fix for savannah bug #19333.
2007-04-27 08:53:50 +00:00
Pavel Roskin
5da9a185c9 * edit.h: Make skip_detach_prompt unsigned. Otherwise, it
cannot get value of 1.
2007-02-03 01:03:53 +00:00
Pavel Tsekov
bb2231fd1b * edit/edit.c (edit_execute_cmd): Update the bracket pair highlighter
state after processing CK_Find, CK_Find_Again, CK_Replace,
CK_Replace_Again, CK_Complete_Word.
2007-01-04 15:37:23 +00:00
Pavel Tsekov
2cb049a9cb * edit/edit.h (edit_move_to_prev_col): Declare the function to have
external linkage.
(edit_find_bracket): Likewise.
* edit/edit.c (edit_move_to_prev_col): Reflect the changes above.
(edit_find_bracket): Likewise.
* edit/editwidget.c (edit_event): When moving around with the mouse
use edit_move_down(), edit_move_up() and edit_move_to_prev_col()
instead of move_cursor() to update the cursor position since
the latter doesn't update some internal variables.
Use edit_find_bracket() to update the bracket pair highlighter
state.
2006-12-10 22:07:28 +00:00
Leonard den Ottolander
59e59d9e3b * edit/editdraw.c (edit_draw_this_line): Remove unused variable book_mark. 2006-12-04 22:44:50 +00:00
Roland Illig
45bb7dbe50 The file's mtime is checked before saving. 2006-11-17 21:50:33 +00:00
Leonard den Ottolander
2f8a75974b * syntax.c (edit_read_syntax_file): Set NENTRIES to 30. 2006-08-02 15:18:22 +00:00
Pavel Tsekov
6625412758 * edit/wordproc.c (next_word_start): A word is preceded by a whitespace -
the latest changes missed that fact. Restore the original behaviour.
2006-06-16 20:01:29 +00:00
Pavel Tsekov
13884c4908 * src/wordproc.c (word_start): Add new argument. Pass extra argument
to next_word_start().
(next_word_start):  Add new argument to denote the maximum number of
characters to process.
(format_this): Reflect the changes above.
2006-06-16 19:34:49 +00:00
Pavel Tsekov
afe0fce14e * edit/choosesyntax.c (pstrcmp): Fix the function declaration. 2006-05-04 12:33:57 +00:00
Leonard den Ottolander
d5a17b01f8 * syntax.c (edit_read_syntax_rules): Zero edit->rules on allocation to
avoid crash after attempting to load a non existent syntax file.
2006-04-03 21:22:09 +00:00
Leonard den Ottolander
76cf84bb69 * choosesyntax.c: Sort syntax list. 2006-03-21 22:23:37 +00:00
Leonard den Ottolander
8d439c2f88 * choosesyntax.c: GPL v2 only. 2006-03-21 22:22:03 +00:00
Pavel Tsekov
2a7a8fa19d * edit/edit-widget.h (struct WEdit): Add new field.
* edit/editcmd.c (edit_save_file): Prompt whether to detach a hardlinked
file if in "Quick save" mode.
Return -1 to indicated that the user requested to cancel the operation.
(edit_save_as_cmd): Adjust the code to handle the new return value of
edit_save_file().
(edit_save_cmd): Likewise.
2006-03-17 15:41:21 +00:00
Pavel Tsekov
1ab4a2b41c * edit/editcmd.c (edit_save_as_cmd): If saving of the file fails
remove only the _save_ lock.
2006-03-17 10:24:50 +00:00
Pavel Tsekov
03e7a434b4 * edit/editlock.c: Fix for savannah bug #13673.
(lock_build_symlink_name): New function.
(edit_lock_file): Use lock_build_symlink_name().
(edit_unlock_file): Likewise.
2006-03-15 16:08:28 +00:00
Pavel Tsekov
fcc6f9bbea * edit/editcmd.c (edit_new_cmd): Remove redundant call to
`edit_unlock_file()'.
(edit_ok_to_exit): Likewise.
2006-03-15 13:20:24 +00:00
Roland Illig
663f821891 * edit.c (user_menu): There is no need to prefix the filename
with PATH_SEP when calling concat_dir_and_file().
2006-02-10 12:29:36 +00:00
Roland Illig
c29b321563 * edit.h: Removed the leading PATH_SEP_STR from EDIT_DIR, as the
latter is not an absolute directory.
	* edit.c: Adjusted the users of EDIT_DIR.
	* editcmd.c: Likewise.
	* syntax.c: Likewise.
	* src/user.c: Likewise.
2006-02-04 14:41:41 +00:00
Leonard den Ottolander
2157716489 edit/edit.c (edit_execute_cmd): Reload syntax on toggle to on. 2006-02-02 19:45:49 +00:00
Leonard den Ottolander
17108c8b2e edit/edit.c, edit/editcmddef.h, edit/editkeys.c: Add Ctrl-S to toggle syntax
highlighting.
2006-02-01 17:07:11 +00:00
Pavel Tsekov
b0ced33741 * edit/editcmd.c: Do not set the field histname' of QuickWidget' unless
the widget is of type `quick_input'.
* src/boxes.c: Likewise.
* src/filegui.c: Likewise.
* src/hotlist.c: Likewise.
2006-01-30 09:22:33 +00:00
Pavel Tsekov
60658b4b35 * editcmd.c (edit_block_copy_cmd): Allow a block of selected
columns	as created by Shift + F3 to be copied anywhere in
the editor area.
2006-01-27 15:00:59 +00:00
Pavel Tsekov
450fe431fc * edit.c (edit_auto_indent): Remove redundant parameters.
Change the indentation strategy to copy whitespace
from the previous line instead of filling up with allegedly
equivalent whitespace depending on the tab setting.
(edit_execute_cmd): Accomodate change of parameters to
edit_auto_indent().
2006-01-26 15:42:56 +00:00