Mercurial > mxe-octave

changeset 2966:26638973a661

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make edit work with backslashes in editor file name
author John W. Eaton <jwe@octave.org>
date Thu, 24 Jan 2013 17:39:30 -0500
parents d35eda9fb1f3
children eeb7a7067d85
files src/octave-6-fixes.patch
diffstat 1 files changed, 57 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/octave-6-fixes.patch	Thu Jan 24 17:39:30 2013 -0500
@@ -0,0 +1,57 @@
+diff -uNr a/scripts/miscellaneous/edit.m b/scripts/miscellaneous/edit.m
+--- a/scripts/miscellaneous/edit.m	2012-11-13 12:31:48.000000000 -0500
++++ b/scripts/miscellaneous/edit.m	2013-01-24 17:37:50.597434926 -0500
+@@ -243,10 +243,11 @@
+   if (nargin < 1)
+     if (exist (FUNCTION.HOME, "dir") == 7 && (isunix () || ! ispc ()))
+       system (cstrcat ("cd \"", FUNCTION.HOME, "\" ; ",
+-                      sprintf (FUNCTION.EDITOR, "")),
++                      sprintf (undo_string_escapes (FUNCTION.EDITOR), "")),
+               [], FUNCTION.MODE);
+     else
+-      system (sprintf (FUNCTION.EDITOR,""), [], FUNCTION.MODE);
++      system (sprintf (undo_string_escapes (FUNCTION.EDITOR), ""),
++              [], FUNCTION.MODE);
+     endif
+     return;
+   endif
+@@ -328,7 +329,8 @@
+       ## If the file exists, then edit it.
+       if (FUNCTION.EDITINPLACE)
+         ## Edit in place even if it is protected.
+-        system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
++        system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
++                         cstrcat ("\"", fileandpath, "\"")),
+                 [], FUNCTION.MODE);
+         return;
+       else
+@@ -345,7 +347,8 @@
+         else
+           fclose (fid);
+         endif
+-        system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
++        system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
++                         cstrcat ("\"", fileandpath, "\"")),
+                 [], FUNCTION.MODE);
+         return;
+       endif
+@@ -361,7 +364,8 @@
+       case {"cc", "m"}
+         0;
+       otherwise
+-        system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
++        system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
++                         cstrcat ("\"", fileandpath, "\"")),
+                 [], FUNCTION.MODE);
+         return;
+     endswitch
+@@ -512,7 +516,8 @@
+     fclose (fid);
+ 
+     ## Finally we are ready to edit it!
+-    system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
++    system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
++                     cstrcat ("\"", fileandpath, "\"")),
+             [], FUNCTION.MODE);
+             
+   endif