summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <mtaylor@qualinost.(none)>2006-12-15 11:45:26 -0800
committerunknown <mtaylor@qualinost.(none)>2006-12-15 11:45:26 -0800
commit58b4c4bf1d88f8f3b9617362d9a564e6de2c3276 (patch)
treec6ecef0c4fe2cd350c932bc0b28df4af10e2e775 /scripts
parent0a93477fb101c6cf74e182f887323c78b6e56e6f (diff)
parent7579130d2dba632a7ebcf31bf9efde4fbbfc5436 (diff)
downloadmariadb-git-58b4c4bf1d88f8f3b9617362d9a564e6de2c3276.tar.gz
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint mysql-test/r/myisam.result: Auto merged
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqlbug.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh
index 6aed140b79d..880ab248a90 100644
--- a/scripts/mysqlbug.sh
+++ b/scripts/mysqlbug.sh
@@ -132,7 +132,13 @@ if test -z "$VISUAL"
then
if test -z "$EDITOR"
then
- EDIT=emacs
+ # Honor debian sensible-editor
+ if test -x "/usr/bin/sensible-editor"
+ then
+ EDIT=/usr/bin/sensible-editor
+ else
+ EDIT=emacs
+ fi
else
EDIT="$EDITOR"
fi