Mercurial > mxe-octave

changeset 2970:e111bf60ebc5

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 (stable octave patch)
author John W. Eaton <jwe@octave.org>
date Thu, 24 Jan 2013 22:00:38 -0500
parents a7db3bcc5d0e
children 7145a94e4f4e
files src/stable-octave-5-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/stable-octave-5-fixes.patch	Thu Jan 24 22:00:38 2013 -0500
@@ -0,0 +1,57 @@
+diff -uNr a/scripts/miscellaneous/edit.m b/scripts/miscellaneous/edit.m
+--- a/scripts/miscellaneous/edit.m	2012-10-18 14:56:23.000000000 -0400
++++ b/scripts/miscellaneous/edit.m	2013-01-24 21:55:43.272206607 -0500
+@@ -206,10 +206,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
+@@ -279,7 +280,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
+@@ -296,7 +298,8 @@
+       else
+         fclose (fid);
+       endif
+-      system (sprintf (FUNCTION.EDITOR, cstrcat ("\"", fileandpath, "\"")),
++      system (sprintf (undo_string_escapes (FUNCTION.EDITOR),
++                       cstrcat ("\"", fileandpath, "\"")),
+               [], FUNCTION.MODE);
+       return;
+     endif
+@@ -312,7 +315,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
+@@ -459,7 +463,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);
+ 
+ endfunction