← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Martin Pool
  • Date: 2006-05-17 07:09:13 UTC
  • mfrom: (1668.1.15 bzr-0.8.mbp)
  • mto: This revision was merged to the branch mainline in revision 1710.
  • Revision ID: mbp@sourcefrog.net-20060517070913-723e387ac91d55c0
merge 0.8 fix branch, including register-branch plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
38
38
    if e is not None:
39
39
        yield e
40
40
        
41
 
    try:
42
 
        yield os.environ["EDITOR"]
43
 
    except KeyError:
44
 
        pass
 
41
    for varname in 'VISUAL', 'EDITOR':
 
42
        if os.environ.has_key(varname):
 
43
            yield os.environ[varname]
45
44
 
46
45
    if sys.platform == 'win32':
47
46
        for editor in 'wordpad.exe', 'notepad.exe':
48
47
            yield editor
49
48
    else:
50
 
        for editor in ['vi', 'pico', 'nano', 'joe']:
 
49
        for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']:
51
50
            yield editor
52
51
 
53
52