[MERGE] Document $VISUAL

[Matthew D. Fuller]

A comment on IRC earlier in the week noted that we don't seem to
document checking $VISUAL.  I've only found one place on the wiki
(aside from the bits that come from the source tree) that seems to
mention it, which I've fixed.  Attached bundle seems to hit the places
in the source tree that do the same.



-- 
Matthew Fuller     (MF4839)   |  fullermd at over-yonder.net
Systems/Network Administrator |  http://www.over-yonder.net/~fullermd/
           On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar revision bundle v0.8
#
# message:
#   Include $VISUAL in the list of env variables when we can't start an
#   editor.
#   
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Sat 2006-11-11 13:25:25.963999987 -0600

=== modified file bzrlib/msgeditor.py
--- bzrlib/msgeditor.py
+++ bzrlib/msgeditor.py
@@ -71,7 +71,8 @@
         else:
             break
     raise BzrError("Could not start any editor.\nPlease specify one with:\n"
-                   " - $BZR_EDITOR\n - editor=/some/path in %s\n - $EDITOR" % \
+                   " - $BZR_EDITOR\n - editor=/some/path in %s\n"
+                   " - $VISUAL\n - $EDITOR" % \
                     config.config_filename())
 
 

=== modified file doc/configuration.txt // last-changed:fullermd at over-yonder.ne
... t-20061111192008-klzw8naola7mde0f
--- doc/configuration.txt
+++ doc/configuration.txt
@@ -99,8 +99,8 @@
 editor
 ------
 The path of the editor that you wish to use if *bzr commit* is run without
-a commit log message. This setting is trumped by the environment variables
-$BZR_EDITOR or $EDITOR.
+a commit log message. This setting is trumped by the environment variable
+$BZR_EDITOR, and overrides $VISUAL and $EDITOR.
 
 check_signatures
 ----------------

=== modified file doc/tutorial.txt // last-changed:fullermd at over-yonder.net-200
... 61111192147-sqtlv0erti2o54t9
--- doc/tutorial.txt
+++ doc/tutorial.txt
@@ -299,10 +299,10 @@
 
 If you use neither the `-m` nor the `-F` option then bzr will open an
 editor for you to enter a message.  The editor to run is controlled by
-your `$EDITOR` environment variable or 
-add `editor` to ~/.bazaar/bazaar.conf; `$BZR_EDITOR` will override
-the above mentioned editor options.  If you quit the editor without
-making any changes, the commit will be cancelled.
+your `$VISUAL` or `$EDITOR` environment variable, which can be overridden
+by the `editor` setting in to ~/.bazaar/bazaar.conf; `$BZR_EDITOR` will
+override either of the above mentioned editor options.  If you quit the
+editor without making any changes, the commit will be cancelled.
 
 Selective commit
 ----------------

=== modified directory  // last-changed:fullermd at over-yonder.net-20061111192525
... -2as2mi0h2m6id0wd
# revision id: fullermd at over-yonder.net-20061111192525-2as2mi0h2m6id0wd
# sha1: f63d543009286c8f11aea8523d1cad03f5d3f5d3
# inventory sha1: c311a9747a23a169da52c41f5d544506c0334cdf
# parent ids:
#   fullermd at over-yonder.net-20061111192147-sqtlv0erti2o54t9
# base id: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
# properties:
#   branch-nick: fix-visual

# message:
#   Mention $VISUAL here, and play with the wording of the other ways of
#   setting the editor to make it flow better.
#   
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Sat 2006-11-11 13:21:47.523999929 -0600

=== modified file doc/tutorial.txt // encoding:base64
LS0tIGRvYy90dXRvcmlhbC50eHQKKysrIGRvYy90dXRvcmlhbC50eHQKQEAgLTI5OSwxMCArMjk5
LDEwIEBACiAKIElmIHlvdSB1c2UgbmVpdGhlciB0aGUgYC1tYCBub3IgdGhlIGAtRmAgb3B0aW9u
IHRoZW4gYnpyIHdpbGwgb3BlbiBhbgogZWRpdG9yIGZvciB5b3UgdG8gZW50ZXIgYSBtZXNzYWdl
LiAgVGhlIGVkaXRvciB0byBydW4gaXMgY29udHJvbGxlZCBieQoteW91ciBgJEVESVRPUmAgZW52
aXJvbm1lbnQgdmFyaWFibGUgb3IgCi1hZGQgYGVkaXRvcmAgdG8gfi8uYmF6YWFyL2JhemFhci5j
b25mOyBgJEJaUl9FRElUT1JgIHdpbGwgb3ZlcnJpZGUKLXRoZSBhYm92ZSBtZW50aW9uZWQgZWRp
dG9yIG9wdGlvbnMuICBJZiB5b3UgcXVpdCB0aGUgZWRpdG9yIHdpdGhvdXQKLW1ha2luZyBhbnkg
Y2hhbmdlcywgdGhlIGNvbW1pdCB3aWxsIGJlIGNhbmNlbGxlZC4KK3lvdXIgYCRWSVNVQUxgIG9y
IGAkRURJVE9SYCBlbnZpcm9ubWVudCB2YXJpYWJsZSwgd2hpY2ggY2FuIGJlIG92ZXJyaWRkZW4K
K2J5IHRoZSBgZWRpdG9yYCBzZXR0aW5nIGluIHRvIH4vLmJhemFhci9iYXphYXIuY29uZjsgYCRC
WlJfRURJVE9SYCB3aWxsCitvdmVycmlkZSBlaXRoZXIgb2YgdGhlIGFib3ZlIG1lbnRpb25lZCBl
ZGl0b3Igb3B0aW9ucy4gIElmIHlvdSBxdWl0IHRoZQorZWRpdG9yIHdpdGhvdXQgbWFraW5nIGFu
eSBjaGFuZ2VzLCB0aGUgY29tbWl0IHdpbGwgYmUgY2FuY2VsbGVkLgogCiBTZWxlY3RpdmUgY29t
bWl0CiAtLS0tLS0tLS0tLS0tLS0tCgo=

=== modified directory  // last-changed:fullermd at over-yonder.net-20061111192147
... -sqtlv0erti2o54t9
# revision id: fullermd at over-yonder.net-20061111192147-sqtlv0erti2o54t9
# sha1: a56ffcbba53d46bda42a9604e23935219e5274c8
# inventory sha1: e9df3424d9e2ce85466c3ebd373128e5af1aa144
# parent ids:
#   fullermd at over-yonder.net-20061111192008-klzw8naola7mde0f
# properties:
#   branch-nick: fix-visual

# message:
#   Correct statement about the precedence of $EDITOR, and mention
#   $VISUAL.
#   
# committer: Matthew Fuller <fullermd at over-yonder.net>
# date: Sat 2006-11-11 13:20:08.303999901 -0600

=== modified file doc/configuration.txt // encoding:base64
LS0tIGRvYy9jb25maWd1cmF0aW9uLnR4dAorKysgZG9jL2NvbmZpZ3VyYXRpb24udHh0CkBAIC05
OSw4ICs5OSw4IEBACiBlZGl0b3IKIC0tLS0tLQogVGhlIHBhdGggb2YgdGhlIGVkaXRvciB0aGF0
IHlvdSB3aXNoIHRvIHVzZSBpZiAqYnpyIGNvbW1pdCogaXMgcnVuIHdpdGhvdXQKLWEgY29tbWl0
IGxvZyBtZXNzYWdlLiBUaGlzIHNldHRpbmcgaXMgdHJ1bXBlZCBieSB0aGUgZW52aXJvbm1lbnQg
dmFyaWFibGVzCi0kQlpSX0VESVRPUiBvciAkRURJVE9SLgorYSBjb21taXQgbG9nIG1lc3NhZ2Uu
IFRoaXMgc2V0dGluZyBpcyB0cnVtcGVkIGJ5IHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZQorJEJa
Ul9FRElUT1IsIGFuZCBvdmVycmlkZXMgJFZJU1VBTCBhbmQgJEVESVRPUi4KIAogY2hlY2tfc2ln
bmF0dXJlcwogLS0tLS0tLS0tLS0tLS0tLQoK

=== modified directory  // last-changed:fullermd at over-yonder.net-20061111192008
... -klzw8naola7mde0f
# revision id: fullermd at over-yonder.net-20061111192008-klzw8naola7mde0f
# sha1: c337463ffe3ca0668d4431f752164c50fc863d7d
# inventory sha1: bb65eb9514eeb47d00f4427c12a66e3a3d3c2dae
# parent ids:
#   pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
# properties:
#   branch-nick: fix-visual