X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=scm%2Feditor.scm;h=c22ff25a717c7f4baafce4a2c026df08199fdbf3;hb=55b4fbd9c83c61ef9074e54696cec751612ef045;hp=5fdd7f4eb644fd0607417f8ad7caef488b0d98b0;hpb=c21383ab66c2abe8e42eda7694eb05e876e6be2c;p=lilypond.git

diff --git a/scm/editor.scm b/scm/editor.scm
index 5fdd7f4eb6..c22ff25a71 100644
--- a/scm/editor.scm
+++ b/scm/editor.scm
@@ -2,15 +2,15 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 
 (define-module (scm editor))
 
 ;; Also for standalone use, so cannot include any lily modules.
 (use-modules
  (ice-9 regex)
-  (srfi srfi-13)
-  (srfi srfi-14))
+ (srfi srfi-13)
+ (srfi srfi-14))
 
 (define PLATFORM
   (string->symbol
@@ -31,13 +31,13 @@
 
 (define editor-command-template-alist
   '(("emacs" .  "emacsclient --no-wait +%(line)s:%(column)s %(file)s || (emacs +%(line)s:%(column)s %(file)s&)")
-    ("gvim" . "gvim --remote +:%(line)s:norm%(column)s %(file)s")
-    ("uedit32" . "uedit32 %(file)s -l%(line)s -c%(column)s")
+    ("gvim" . "gvim --remote +:%(line)s:norm%(char)s %(file)s")
+    ("uedit32" . "uedit32 %(file)s -l%(line)s -c%(char)s")
     ("nedit" . "nc -noask +%(line)s %(file)s")
     ("gedit" . "gedit +%(line)s %(file)s")
     ("jedit" . "jedit -reuseview %(file)s +line:%(line)s")
-    ("syn" . "syn -line %(line)s -col %(column)s %(file)s")
-    ("lilypad" . "lilypad +%(line)s:%(column)s %(file)s")))
+    ("syn" . "syn -line %(line)s -col %(char)s %(file)s")
+    ("lilypad" . "lilypad +%(line)s:%(char)s %(file)s")))
 
 (define (get-command-template alist editor)
   (define (get-command-template-helper)
@@ -60,12 +60,14 @@
      x
      (re-sub "\\\\" "/" x)))
 
-(define-public (get-editor-command file-name line column)
+(define-public (get-editor-command file-name line char column)
   (let* ((editor (get-editor))
 	 (template (get-command-template editor-command-template-alist editor))
 	 (command
 	  (re-sub "%\\(file\\)s" (format #f "~S" file-name)
 		  (re-sub "%\\(line\\)s" (format #f "~a" line)
-			  (re-sub "%\\(column\\)s" (format #f "~a" column)
-				  (slashify template))))))
+			  (re-sub "%\\(char\\)s" (format #f "~a" char)
+				  (re-sub
+				   "%\\(column\\)s" (format #f "~a" column)
+				   (slashify template)))))))
     command))