Commit Graph

8379 Commits

Author SHA1 Message Date
Slava Zanko
faac6020ad Ticket #413 (Make dist do not include mc.charset)
Description:
If before
  make dist*
  ./configure

was invoked without parameters next build from resulted tarball with
  ./configure --enable-charset
stop on error "mc.charset not found".
"./configure --enable-charset" hack before make dist* resolve this trouble.

Fix issue: In contrib/Makefile.am EXTRA_DIST variable was contain filenames relative to --enable-charset option.
Now mc.charsets file alvays present in EXTRA_DIST variable.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-18 14:13:54 +03:00
Ilia Maslakov
86ca1f6663 Merge branch 'master' of ssh://angel_il@midnight-commander.org:2222/git/mc 2009-06-17 13:15:17 +00:00
Sergei Trofimovich
3b2707280f Merge commit 'origin/409_regex_build_fix'
* commit 'origin/409_regex_build_fix':
  Ticket #409: search: build failure on glib <2.14
  Ticket #409: search: build failure on glib <2.14
2009-06-17 16:14:15 +03:00
Ilia Maslakov
5c28d2bda4 Ticket #321 (Trouble with mc's clipboard paste)
add: paste as vertical block if clipfile contain magic sequence
add: vertical paste from file
add: symbolic definition MAGIC_VERTICAL for "\1\1\1\1\n" magic sequence
2009-06-17 13:12:03 +00:00
Sergei Trofimovich
f4611f3651 Ticket #409: search: build failure on glib <2.14
During constant renaming #ifdef'ed path was broken.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-17 15:52:21 +03:00
Sergei Trofimovich
6ee0ed5750 Ticket #409: search: build failure on glib <2.14
During constant renaming #ifdef'ed path was broken.

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-17 15:14:47 +03:00
Slava Zanko
8e5cc41da1 Merge branch '305_extra_character_on_renaming'
* 305_extra_character_on_renaming:
  Fixed regex search by mask '.*' in multibyte strings (utf-8)
  Ticket #305 (Extra character on renaming)
2009-06-17 13:04:11 +03:00
Sergei Trofimovich
22ca1a9263 Merge commit 'origin/403_versioning_cleanup'
* commit 'origin/403_versioning_cleanup':
  version.sh: pregenerate version.h to avoid running ./configure twice in clean environment
  version.sh: unbreak version.h generation (--git-dir needs path to bare repo)
  version.sh: fix typo
  version.sh: more elegant extraction of old version
  version.sh: fix bashisms
  version.sh: don't suppress error messages from git availability check
2009-06-17 13:01:28 +03:00
Slava Zanko
a44141e7a0 Fixed regex search by mask '.*' in multibyte strings (utf-8)
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-17 11:39:27 +03:00
Slava Zanko
9dbdac0ad3 Ticket #305 (Extra character on renaming)
Fixed renaming/copying utf-8 filenames and directoryes.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-17 11:39:26 +03:00
Ilia Maslakov
a0508934ab Merge branch 'master' of ssh://angel_il@midnight-commander.org:2222/git/mc 2009-06-16 19:07:16 +00:00
Sergei Trofimovich
eea108377d version.sh: pregenerate version.h to avoid running ./configure twice in clean environment
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-16 20:40:24 +03:00
Sergei Trofimovich
3e81dd57c1 version.sh: unbreak version.h generation (--git-dir needs path to bare repo)
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-16 20:33:24 +03:00
Oswald Buddenhagen
a1864899d2 version.sh: fix typo
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-16 20:25:01 +03:00
Oswald Buddenhagen
d327943f4d version.sh: more elegant extraction of old version
sed is rather powerful ;)

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-16 20:24:59 +03:00
Oswald Buddenhagen
c7ba6209df version.sh: fix bashisms
Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-16 20:24:58 +03:00
Oswald Buddenhagen
9a5c9cbc88 version.sh: don't suppress error messages from git availability check
otherwise there is no feedback at all.
as it happens, this also fixes a bashism

Signed-off-by: Sergei Trofimovich <slyfox@inbox.ru>
2009-06-16 20:24:57 +03:00
Andrew Borodin
3337c39c54 Merge branch '361_editor_public_api'
* 361_editor_public_api:
  Fixed missed declaration of simple_statusbar variable.
  Fixed comments and copyright info.
  Hide private API of editor (#361).
2009-06-16 15:37:25 +04:00
Andrew Borodin
0c51aa5ae1 Fixed missed declaration of simple_statusbar variable. 2009-06-16 15:36:45 +04:00
Andrew Borodin
6999a6123b Fixed comments and copyright info. 2009-06-16 15:36:45 +04:00
Andrew Borodin
fd09abaeb2 Hide private API of editor (#361).
All editor private API stuff is located now in edit/edit-impl.h.
Public API is located in edit/edit.h.
Added functions to read some fields of WEdit struct.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-06-16 15:36:45 +04:00
Andrew Borodin
537bc71069 Merge branch '402_select_codepage'
* 402_select_codepage:
  Fixed source_codepage handling in editor (#402).
  Fixed type of variables that store result of get_codepage_id().
  Fixed codepage selection (#402).
2009-06-16 15:18:12 +04:00
Andrew Borodin
efbbd3883f Fixed source_codepage handling in editor (#402).
Signed-off-by: Andrew Borodin <borodin@borodin.zarya>
2009-06-16 11:32:59 +04:00
Ilia Maslakov
dc6cf0b6fa Ticket #305 (dont work rename/copy on some chars)
fix: incorrect work rename/copy
2009-06-15 20:48:42 +00:00
Andrew Borodin
6e86e9f383 Fixed type of variables that store result of get_codepage_id(). 2009-06-15 23:35:20 +04:00
Andrew Borodin
205fa24e7d Fixed codepage selection (#402).
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2009-06-15 20:27:17 +04:00
Slava Zanko
8bc27c83e8 Merge branch '340_forgotten_include'
* 340_forgotten_include:
  Added forgotten #include "../src/strescape.h" for avoid warnings
2009-06-15 10:10:15 +03:00
Ilia Maslakov
2dffac596d Merge branch '327_simple_editor_status'
* 327_simple_editor_status:
  Simple statusbar mode for editor.
2009-06-14 18:25:27 +00:00
Ilia Maslakov
2f8e7cae7a Ticket #404 (Need more action in Editor menu)
add entries for many action:

 menu Edit
   * Copy to clipfile
   * Cut to clipfile
   * Paste from clipfile
   * Toggle bookmark
   * Next bookmark
   * Prev bookmark
   * Flush bookmark
 menu Command
   * Find declaration
   * Back from declaration
   * Forward to declaration

add show shortcuts for copy/cut/paste clipfile
2009-06-14 17:17:32 +00:00
Slava Zanko
80ad54decb Added forgotten #include "../src/strescape.h" for avoid warnings
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-13 00:27:23 +03:00
Sergei Trofimovich
f5dce266fe Merge commit 'origin/340_inrorrect_handling_of_wildcards'
* commit 'origin/340_inrorrect_handling_of_wildcards': (21 commits)
  Fixed work with copying/moving files by mask into subdirs
  Fixed bug with copying files/dirs into directory with 'wild' name (such as ${}, \1, etc.)
  Fixed patterns escaping of wild filenames (such as \1, ${1}, \U, etc).
  Removed unused debug code from src/filegui.c
  Refactoring: renamed variable 'loop' into 'curr_index'
  Changed defined constants to static const char[] declarations.
  Fixed declarations of functions. May be, need to split with previous commmit...
  Reworked functions strutils_shell_escape and strutils_shell_unescape
  Renamed functions shell_escape (to strutils_shell_escape) and shell_unescape (to strutils_shell_unescape)
  Just identation of some source files
  Renamed function shell_is_char_escaped to strutils_is_char_escaped; removed function mc_search_is_char_escaped
  Moved 'escape' and 'unescape' strings functions from src/util.[ch] into src/strescape.[ch]
  Fixed crash if replace group ${N} used into replace string
  Some cosmetic optimisation for less code :)
  Fixed searched token in source file mask.
  Fixed NULL acertion if replacement don't correct
  Handle new search replace behaviour into src/file.c. Also fixed filemask into src/filegui.c
  Search Replace now handled \U,\u,\L,\l and \E modificators.
  Just identation of regex.c and search.h
  search engine: Added new syntax for replace tokenks.
  ...
2009-06-12 23:02:44 +03:00
Ilia Maslakov
b955d8c2ff Merge branch '318_alt_arrows_select_block'
* 318_alt_arrows_select_block:
  Add esc sequencies to src/key.c for xterm
2009-06-12 14:53:04 +00:00
Slava Zanko
86e3d2123c Fixed work with copying/moving files by mask into subdirs
For example, we need to move files:
some_test.ext
this_is_file.ext

into subdirs, named as first char of filenames:
./s/
./d/

Select needed files and press F5(F6)
Source mask: ?*
to: \1/\1\2

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 17:10:38 +03:00
Andrew Borodin
0bfd10f4c6 edit/editmenu.c: added separator in 'Options' submenu. 2009-06-12 17:30:21 +04:00
Ilia Maslakov
f4844e5b21 Add esc sequencies to src/key.c for xterm
Add CK_*_Alt_Highlight commands in edit/editcmddef.h
Add processing for CK_*_Alt_Highlight commands in edit/edit.c
2009-06-12 12:54:52 +00:00
Slava Zanko
e335712e41 Fix path to Syntax file
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 16:12:10 +04:00
Andrew Borodin
0791b5b200 Revert ""Exit" menu entry have been moved from "File" submenu to "Command" one."
This reverts commit 00497702b78138b888a55eff49fd90d99cb034b4.
2009-06-12 16:12:10 +04:00
Andrew Borodin
4a748afdc0 "Exit" menu entry have been moved from "File" submenu to "Command" one.
Changed hotkey of "Exteranl panelize" menu entry.
2009-06-12 16:12:10 +04:00
Andrew Borodin
5241c7a5d4 src/main.c: don't display "Encoding..." menu entry if charsets support is
disabled.

edit/editmenu.c: edded "Encoding..." menu entry to the "Command" submenu.
Display it if charsets support is enabled.
2009-06-12 16:12:10 +04:00
Andrew Borodin
0c01337e81 src/cmd.c: fixed double definition of quick_chdir_cmd(). 2009-06-12 16:12:10 +04:00
Andrew Borodin
a623c3a13c Editor: sync with new global config location (user menu and syntax files). 2009-06-12 16:12:10 +04:00
Andrew Borodin
fb48d4a295 Small reorganization of MC and Editor menus.
The 'User Menu' entry is moved from 'File' submenu to 'Command' one.
The 'Edit editor menu file' and 'Edit syntax file' entries are moved
from main MC menu ('Command' submenu) to editor main menu ('Options'
submenu) and renamed.

src/cmd.c (check_for_default): moved to util.c and maken global.
(menu_edit_cmd): rewritten to handle MC menu files only and renamed
to edit_mc_menu_cmd.
Editor relevant routines are moved to editor code.

src/cmd.h: cleanup.

src/main.c: main menu reorganization.

src/user.h: moved editor macros to edit/edit.h.

src/util.c, src/util.h: check_for_default function from src/cmd.h.
Rewritten to use exist_file() function.

edit/editcmddef.h: added new commands:
CK_Load_Syntax_File and CK_Load_Menu_File.

edit/edit.h: editor file macros from src/user.h.
New type for file which is currently being edited.
Modified edit_load_cmd function to be more advanced.

edit/edit.c (edit_execute_cmd): handle new commands:
CK_Load_Syntax_File and CK_Load_Menu_File.

edit/editmenu.c: menu reorganization: moved two entries here from main
MC menu. Added requireq handle functions. Small optimization: removed
extra layer in menu entry handlers.

edit/editcmd.c: menu and syntax files edit is implemented.
Modified edit_load_cmd function to be more advanced.
2009-06-12 16:12:10 +04:00
Mikhail S. Pobolovets
9c79518b9a A small typo in po/fr.po
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2009-06-12 13:57:04 +03:00
Slava Zanko
823d92e69f Fixed bug with copying files/dirs into directory with 'wild' name (such as ${}, \1, etc.)
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:01 +03:00
Slava Zanko
bbb800530c Fixed patterns escaping of wild filenames (such as \1, ${1}, \U, etc).
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:01 +03:00
Slava Zanko
a58a14c357 Removed unused debug code from src/filegui.c
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:01 +03:00
Slava Zanko
6e04cf1250 Refactoring: renamed variable 'loop' into 'curr_index'
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:00 +03:00
Slava Zanko
db71fba72f Changed defined constants to static const char[] declarations.
Also, fixed escape of '\' char in glob-like string.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:00 +03:00
Slava Zanko
04b34832ef Fixed declarations of functions. May be, need to split with previous commmit...
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:00 +03:00
Slava Zanko
be27cd1a2e Reworked functions strutils_shell_escape and strutils_shell_unescape
also added function:
 * strutils_glob_escape
 * strutils_glob_unescape
 * strutils_regex_escape
 * strutils_regex_unescape

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
2009-06-12 10:32:00 +03:00