[Pkg-jed-commit] [SCM] Debian packaging of JED branch, upstream-fixes, updated. 231492d81036768d4b77c9dc2e657234f4ec5acf

[Jörg Sommer]

The following commit has been merged in the upstream-fixes branch:
commit 4029ce1a874d801e009d95e587f01a73d137558a
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Sun Nov 22 18:34:27 2009 +0100

    ide mode 1.3.4 from Guido Gonzato
    
    Guido Gonzato provides a new version of ide mode on his page [1]. This
    patch upgrades the files in the source tree to this version. I've changed
    the line endings from CR+NL (Guido's version) to NL, because the old
    files in the source tree had unix line endings.
    
    [1] http://guido.gonzato.googlepages.com/jed.html

diff --git a/lib/ide.hlp b/lib/ide.hlp
index 4356a91..84caccd 100644
--- a/lib/ide.hlp
+++ b/lib/ide.hlp
@@ -1,4 +1,4 @@
-JED IDE mode 1.3.0.  ^ = Ctrl (e.g., ^X = Ctrl-X); M = Alt (M-X = Alt-X)
+JED IDE mode 1.3.4.  ^ = Ctrl (e.g., ^X = Ctrl-X); M = Alt (M-X = Alt-X)
 Press `q' to quit this help screen; F6 or ^KP to switch to the next buffer
 
 CURSOR              GO TO               BLOCK          DELETE       EXIT
diff --git a/lib/ide.sl b/lib/ide.sl
index 8c19698..e55e750 100644
--- a/lib/ide.sl
+++ b/lib/ide.sl
@@ -3,7 +3,7 @@
 %   Put the line: () = evalfile ("ide.sl");
 %   in your jed.rc startup file.
 %
-%   Written by Guido Gonzato <ggonza at tin.it>;
+%   Written by Guido Gonzato <guido.gonzato at univr.it>;
 %   based on John E. Davis' original wordstar.sl.
 %   Contributions by J\o ergen Larsen <jl at dirac.ruc.dk>,
 %   and John Fattaruso <johnf at ti.com>
@@ -15,8 +15,8 @@
 %
 %   Please send me requests and bug reports, should you find any.
 %
-%   Version 1.3.3; for jed B0.99.13 upwards.
-%   Last modified: 3 October 2002
+%   Version 1.3.4; for jed B0.99.13 upwards.
+%   Last modified: 2 April 2003
 
 Help_File = "ide.hlp";
 
@@ -31,11 +31,11 @@ custom_variable ("Ide_Skippable_Chars",
 		 "\n\t !\"#$%&'()*+,-./:;<=>?@[\]^`{|}~");
 
 #ifndef IBMPC_SYSTEM
-private variable Key_BS_Del      = "^?";
-private variable Key_Alt_BS_Del  = strcat("\e", Key_BS_Del);
+static variable Key_BS_Del      = "^?";
+static variable Key_Alt_BS_Del  = strcat("\e", Key_BS_Del);
 #endif
 
-private variable Ide_Bookmark_Exist = 1;
+static variable Ide_Bookmark_Exist = 1;
 set_status_line (" Jed %v: %b (%m%n) (%p %c) %t", 1);
 
 unset_ctrl_keys ();
@@ -258,7 +258,7 @@ $1 = 13;
 % following functions; bookmark 11 and 12 mark the beginning and end of
 % the block (used by ^QB and ^QK)
 
-private variable _Ide_Bookmarks = Mark_Type[$1];
+static variable _Ide_Bookmarks = Mark_Type[$1];
 
 %  ide_set_bookmark () and ide_goto_bookmark () are implemented to provide
 %  a more Borland-ish way of copying and moving blocks, and of moving 
@@ -525,8 +525,8 @@ define ide_next_buffer (previous)       % Key_F6 | ^KN | Key_Alt_F6 | ^KP
 % blocks are implemented a la Emacs to maintain compatibility with most .sl
 % files (e.g., latex.sl, cmode.sl, etc)
 
-private variable IDE_Block_Buffer = "*ide-clipboard*";
-private variable IDE_Block_Buffer_Empty = 1;
+static variable IDE_Block_Buffer = "*ide-clipboard*";
+static variable IDE_Block_Buffer_Empty = 1;
 
 define ide_copy_block_to_buffer ()
 % paste the new region to the clipboard, then delete the old stuff
@@ -616,9 +616,9 @@ define ide_open_file_at_cursor ()       % Alt-Return, J.L.
    skip_chars  ("-0-9a-zA-Z_!%+~./"); % right limit
 #else % DOS is supposed here:
    % DOS path names have backslashes and may contain a drive spec.
-   bskip_chars ("-0-9a-zA-Z_!%+~./:\\"); % left limit
+   bskip_chars ("-0-9a-zA-Z_!%+~./\\:"); % left limit
    push_mark ();
-   skip_chars  ("-0-9a-zA-Z_!%+~./:\\"); % right limit
+   skip_chars  ("-0-9a-zA-Z_!%+~./\\:"); % right limit
 #endif
    variable fn = bufsubstr (); % the file name
    pop_mark_0 ();
@@ -648,7 +648,7 @@ define ide_select_word ()               % ^KT, Borland IDE facility
 
 #ifndef IBMPC_SYSTEM
 
-private variable Last_Process_Command = Null_String;
+static variable Last_Process_Command = Null_String;
 
 define ide_filter_region ()             % ^K/, Joe extension
 {
@@ -733,7 +733,7 @@ define ide_better_help ()
 
 % Menu Interface.  Use existing menu definitions in most cases, but
 % change definitions in others. 
-private define ide_load_popups_hook ()
+static define ide_load_popups_hook ()
 {
    variable m;
 
@@ -812,7 +812,7 @@ private define ide_load_popups_hook ()
    menu_append_item (m, "Search &Match", "goto_match");
    
    m = "Global.&Buffers";
-   menu_append_separator (m);
+   % menu_append_separator (m);
    menu_append_item (m, "C&ompile", "compile");
    menu_append_item (m, "&Next Error", "compile_parse_errors");
    menu_append_item (m, "&Previous Error", "compile_previous_error");
@@ -820,7 +820,7 @@ private define ide_load_popups_hook ()
      menu_append_item (m, "Debug with &gdb", "gdb_mode");
    
    m = "Global.&Help";
-   menu_append_separator (m);
+   % menu_append_separator (m);
    menu_append_item (m, "Describe ID&E Mode", "ide_better_help");
 }
 

-- 
Debian packaging of JED