Browse Source

Merge branch '2620_cleanup'

* 2620_cleanup: (25 commits)
  vfs_parse_ls_lga: The checks for timestamp is commented out.
  Include config.h to all test's files
  vfs_parse_ls_lga: Make tests output more verbose
  Ticket #2627: Fixed several errors in manpages.
  Fix build with --disable-charset option.
  Added the 'c' hotkey for 'Compile and link current .c file' item of user menu.
  Editor: reduce scope of some functions.
  Editor: reduce scope of some functions.
  Editor: reduce scope of some functions.
  (get_paragraph): fix of pointer difference.
  (load_keymap_from_section): minor optimization.
  (load_keymap_from_section): remove unneeded keybind conversions.
  Added percent sign to key names.
  keymap files: unification of Fxx keys: move to lower case.
  (mc_refresh): moved from lib/widget/wtools.[ch] to lib/widget/dialog-switch.[ch]
  Man pages clean up
  Remove CK_Help action handler in diffviewer
  (size_trunc_len): fixed potential integer overflow if SI is used.
  VFS small optimization
  Remove extra screen update after show help.
  ...
Slava Zanko 13 years ago
parent
commit
e7ffcc49b5
10 changed files with 12 additions and 26 deletions
  1. 0 3
      doc/man/hu/mc.1.in
  2. 0 3
      doc/man/it/mc.1.in
  3. 2 5
      doc/man/mc.1.in
  4. 0 3
      doc/man/pl/mc.1.in
  5. 1 6
      doc/man/ru/mc.1.in
  6. 0 4
      doc/man/sr/mc.1.in
  7. 2 2
      lib/charsets.h
  8. 1 0
      lib/fs.h
  9. 1 0
      lib/global.c
  10. 5 0
      lib/global.h

+ 0 - 3
doc/man/hu/mc.1.in

@@ -2415,9 +2415,6 @@ Egy sort gördít vissza.
 .B C\-l
 Frissíti képernyőt.
 .PP
-.B !
-Shell belépés a jelenlegi munkakönyvtárba.
-.PP
 .B "[n] m"
 Beállítja az n kijelölést.
 .PP

+ 0 - 3
doc/man/it/mc.1.in

@@ -2452,9 +2452,6 @@ Ridisegna lo schermo.
 .B C\-o
 Passa alla subshell e mostra la schermata dei comandi.
 .PP
-.B !
-Come C\-o, ma esegue una nuova shell se la subshell non sta andando.
-.PP
 .B "[n] m"
 Imposta l'indice n.
 .PP

+ 2 - 5
doc/man/mc.1.in

@@ -2887,9 +2887,6 @@ Refresh the screen.
 .B C\-o
 Switch to the subshell and show the command screen.
 .PP
-.B !
-Like C\-o, but run a new shell if the subshell is not running.
-.PP
 .B "[n] m"
 Set the mark n.
 .PP
@@ -3532,8 +3529,8 @@ with the assignment of colors, as described in Section
 Colors\&.
 .\"Colors"
 .PP
-If your skin contains any of 256\-color definitions, you should define the
-'256colors' key set to TRUE value in [skin] section.
+If your skin contains any of 256\-color definitions, you should define
+the '256colors' key set to TRUE value in [skin] section.
 
 .PP
 A skin\-file is searched on the following algorithm (to the first one found):

+ 0 - 3
doc/man/pl/mc.1.in

@@ -2075,9 +2075,6 @@ Przewija jedną linię wstecz.
 .BR C\-l .
 Odświeża ekran.
 .PP
-.BR ! .
-Włącza powłokę w aktualnym katalogu roboczym.
-.PP
 .BR C\-f .
 Przeskakuje do następnego pliku.
 .PP

+ 1 - 6
doc/man/ru/mc.1.in

@@ -1494,7 +1494,7 @@ Midnight Commander создает дерево путем просмотра т
 Компоненты списка должны быть разделены двоеточиями. Например
 .PP
 .nf
-.cdrom:/nfs/wuarchive:/afs
+/cdrom:/nfs/wuarchive:/afs
 .fi
 .PP
 Относительные пути также поддерживаются. Следующий пример показывает, как
@@ -3157,11 +3157,6 @@ ASCII и шестнадцатеричный (hex). Для переключени
 .B C\-o
 Переключиться в subshell и показать окно команд.
 .PP
-.B !
-Запустить новый экземпляр оболочки в текущем каталоге (временный выход в
-shell, возврат в программу просмотра по
-.BR C\-d ).
-.PP
 .B [n] m
 Установить метку с номером n (кавычки не вводятся).
 .PP

+ 0 - 4
doc/man/sr/mc.1.in

@@ -2442,10 +2442,6 @@ linux би вас одвело у /usr/src/linux).
 .B C\-o
 Прелази у подљуску и приказује наредбени екран.
 .PP
-.B !
-Исто као C\-o, али у случају да подљуска није покренута покреће нову
-љуску.
-.PP
 .B "[n] m"
 Поставља ознаку `n'.
 .PP

+ 2 - 2
lib/charsets.h

@@ -93,7 +93,7 @@ convert_to_display_c (int c)
 {
     if (c < 0 || c >= 256)
         return c;
-    return conv_displ[c];
+    return (int) conv_displ[c];
 }
 
 static inline int
@@ -101,7 +101,7 @@ convert_from_input_c (int c)
 {
     if (c < 0 || c >= 256)
         return c;
-    return conv_input[c];
+    return (int) conv_input[c];
 }
 
 #endif /* HAVE_CHARSET */

+ 1 - 0
lib/fs.h

@@ -88,6 +88,7 @@ static inline void
 compute_namelen (struct dirent *dent __attribute__ ((unused)))
 {
 #ifdef DIRENT_LENGTH_COMPUTED
+    (void) dent;
     return;
 #else
     dent->d_namlen = strlen (dent);

+ 1 - 0
lib/global.c

@@ -104,6 +104,7 @@ mc_global_t mc_global = {
         .disable_colors = FALSE,
         .ugly_line_drawing = FALSE,
         .old_mouse = FALSE,
+        .alternate_plus_minus = FALSE,
     },
 
     .vfs =

+ 5 - 0
lib/global.h

@@ -258,6 +258,11 @@ typedef struct
 
         /* Tries to use old highlight mouse tracking */
         gboolean old_mouse;
+
+        /* If true, use + and \ keys normally and select/unselect do if M-+ / M-\.
+           and M-- and keypad + / - */
+        gboolean alternate_plus_minus;
+
     } tty;
 
     struct

Some files were not shown because too many files changed in this diff