Mercurial Mercurial > repos > isabelle / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Tools/jEdit/patches/emacs_macros
author wenzelm
Sat, 15 Feb 2025 14:37:41 +0100
changeset 82181 a0d1d772ccab
permissions -rw-r--r--
more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
82181
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     1
 
diff -ru jedit5.7.0/jEdit/macros/Emacs/Emacs_Insert_File.bsh jedit5.7.0-patched/jEdit/macros/Emacs/Emacs_Insert_File.bsh
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     2
 
--- jedit5.7.0/jEdit/macros/Emacs/Emacs_Insert_File.bsh	2024-08-03 19:53:28.000000000 +0200
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     3
 
+++ jedit5.7.0-patched/jEdit/macros/Emacs/Emacs_Insert_File.bsh	2025-02-14 13:36:18.460665938 +0100
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     4
 
@@ -14,7 +14,7 @@
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     5
 
     else
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     6
 
         path = dirname (path);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     7
 
     result = GUIUtilities.showVFSFileDialog(view, path, VFSBrowser.OPEN_DIALOG, false);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     8
 
-    if (result != null)
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
     9
 
+    if (result.length > 0)
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    10
 
         buffer.insertFile (view, result[0]);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    11
 
 }
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    12
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    13
 
diff -ru jedit5.7.0/jEdit/macros/Emacs/Emacs_Next_Line.bsh jedit5.7.0-patched/jEdit/macros/Emacs/Emacs_Next_Line.bsh
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    14
 
--- jedit5.7.0/jEdit/macros/Emacs/Emacs_Next_Line.bsh	2024-08-03 19:53:28.000000000 +0200
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    15
 
+++ jedit5.7.0-patched/jEdit/macros/Emacs/Emacs_Next_Line.bsh	2025-02-14 13:39:47.045930441 +0100
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    16
 
@@ -12,16 +12,13 @@
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    17
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    18
 
 void emacsNextLine(View view){
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    19
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    20
 
-	// need access to textArea.lastLinePartial
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    21
 
-	setAccessibility(true);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    22
 
-
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    23
 
 	int first = textArea.getFirstLine();
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    24
 
 	int caretLine = textArea.getScreenLineOfOffset(textArea.getCaretPosition());
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    25
 
 	int visibleLines = textArea.getVisibleLines();
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    26
 
 	int electricScroll = textArea.getElectricScroll();
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    27
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    28
 
 	if(caretLine != -1 && caretLine+1 >=
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    29
 
-			(visibleLines - (electricScroll + (textArea.lastLinePartial ? 1 : 0))))
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    30
 
+			(visibleLines - (electricScroll + (textArea.isLastLinePartial() ? 1 : 0))))
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    31
 
 	{
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    32
 
 		int newFirst = (first + (visibleLines - electricScroll) / 2);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    33
 
 		textArea.setFirstLine(newFirst);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    34
 
diff -ru jedit5.7.0/jEdit/macros/Emacs/Emacs_Previous_Line.bsh jedit5.7.0-patched/jEdit/macros/Emacs/Emacs_Previous_Line.bsh
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    35
 
--- jedit5.7.0/jEdit/macros/Emacs/Emacs_Previous_Line.bsh	2024-08-03 19:53:28.000000000 +0200
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    36
 
+++ jedit5.7.0-patched/jEdit/macros/Emacs/Emacs_Previous_Line.bsh	2025-02-14 13:40:14.798441955 +0100
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    37
 
@@ -12,9 +12,6 @@
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    38
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    39
 
 void emacsPreviousLine(View view){
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    40
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    41
 
-	// need access to textArea.lastLinePartial
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    42
 
-	setAccessibility(true);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    43
 
-
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    44
 
 	int first = textArea.getFirstLine();
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    45
 
 	int caretLine = textArea.getScreenLineOfOffset(textArea.getCaretPosition());
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    46
 
 	int visibleLines = textArea.getVisibleLines();
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    47
 
diff -ru jedit5.7.0/jEdit/macros/Emacs/EmacsUtil.bsh jedit5.7.0-patched/jEdit/macros/Emacs/EmacsUtil.bsh
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    48
 
--- jedit5.7.0/jEdit/macros/Emacs/EmacsUtil.bsh	2024-08-03 19:53:28.000000000 +0200
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    49
 
+++ jedit5.7.0-patched/jEdit/macros/Emacs/EmacsUtil.bsh	2025-02-14 13:41:40.315946858 +0100
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    50
 
@@ -31,6 +31,7 @@
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    51
 
         buf.append (c);
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    52
 
         if (c == '\n')
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    53
 
             break;
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    54
 
+        i++;
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    55
 
     }
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    56
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    57
 
     return buf.toString();
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    58
 
@@ -266,6 +267,8 @@
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    59
 
 int findBeginningOfSentence()
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    60
 
 {
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    61
 
     caret = textArea.getCaretPosition() - 1;
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    62
 
+    if (caret < 0)
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    63
 
+        caret = 0;
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    64
 
     if (charAt (caret) == '.')
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    65
 
         caret--;
a0d1d772ccab more robust jEdit Emacs Macros, based on patch #642 "bundled Emacs Macros are broken" (still open in jedit-5.7.0);
wenzelm
parents:
diff changeset 
    66
isabelle