← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-17 08:50:40 UTC
  • mfrom: (1704.2.18 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060517085040-ee6e33957c557fba
(mbp) merge 0.8 fixes; fix #32587

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