X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Feditor.scm;h=66c3709fb2b2bdedf6337226470aa385aba14ad3;hb=153ac629a65c6528c052e7444bf550bbaa8d558b;hp=46494c2912943d5bfb832fdb83f79bc106a52240;hpb=e3c806d04a094d01eba6dae6a049475d943b34aa;p=lilypond.git diff --git a/scm/editor.scm b/scm/editor.scm index 46494c2912..66c3709fb2 100644 --- a/scm/editor.scm +++ b/scm/editor.scm @@ -1,16 +1,27 @@ -;;;; editor.scm -- +;;;; This file is part of LilyPond, the GNU music typesetter. ;;;; -;;;; source file of the GNU LilyPond music typesetter -;;;; -;;;; (c) 2005 Jan Nieuwenhuizen +;;;; Copyright (C) 2005--2012 Jan Nieuwenhuizen +;;;; +;;;; LilyPond is free software: you can redistribute it and/or modify +;;;; it under the terms of the GNU General Public License as published by +;;;; the Free Software Foundation, either version 3 of the License, or +;;;; (at your option) any later version. +;;;; +;;;; LilyPond is distributed in the hope that it will be useful, +;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;;; GNU General Public License for more details. +;;;; +;;;; You should have received a copy of the GNU General Public License +;;;; along with LilyPond. If not, see . (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 @@ -30,13 +41,14 @@ "emacs")))) (define editor-command-template-alist - '(("emacs" . "emacsclient --no-wait +%(line)s:%(column)s %(file)s") + '(("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") + ("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") - ("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) @@ -59,12 +71,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))