Changeset 6647:638d1bf0fe74

Timestamp:

10/04/07 19:46:31 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Children:

6648:1b0ff5e3f10d, 6653:0e8bb6f4816b

Message:

Some fixes to the edit command.

File:

• sage/misc/edit_module.py (modified) (4 diffs)

sage/misc/edit_module.py

@@ -51 +51 @@
 template_defaults = {
       'vi'       : Template('vi -c ${line} ${file}'),
+      'vim'      : Template('vim -c ${line} ${file}'),      
       'emacs'    : Template('emacs ${opts} +${line} ${file}'),
       'nedit-nc' : Template('nedit-nc -line ${line} ${file}'),
@@ -128 +129 @@
    
    if template_string in template_defaults.keys():
-     template_string = template_defaults[template_string]
+      template_string = template_defaults[template_string]
    edit_template = Template(template_string)
          
-def edit(obj):
+def edit(obj, bg=False, editor=None):
    r"""
-   Open source of obj in editor of your choice.
-   
+   Open source code of obj in editor of your choice.
+
+   INPUT:
+       bg -- bool (default: False); if True, then the
+             editor is run in the background
+
    AUTHOR:
        Nils Bruin (2007-10-03)
@@ -169 +174 @@
 
    try:
-      EDITOR = os.environ['EDITOR'].split()
+      if editor:
+         ED = editor
+      else:
+         ED = os.environ['EDITOR']
+      EDITOR = ED.split()
       base = EDITOR[0]
       opts = ' '.join(EDITOR[1:])
@@ -177 +186 @@
    filename, lineno = file_and_line(obj)
    cmd = edit_template.substitute(opts = opts, line = lineno, file = filename)
-   cmd += ' &'
+   if bg:
+      cmd += ' &'
    print cmd
    os.system(cmd)