aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-07-31 22:11:46 +0200
committerRickard Green <[email protected]>2012-07-31 22:11:46 +0200
commit24ad2d1d985bbadb28dc8fe9dfee5e33c3bdcbbc (patch)
tree15bb34f949ec800c8ff694ad7d2caf43e93eb2a4 /erts
parentd15c8cec3c9ecbba18fa5ed5cf6e8050c0e1a239 (diff)
parent430ec2a34c5042970a29b0c198fe3ac1c9b10d75 (diff)
downloadotp-24ad2d1d985bbadb28dc8fe9dfee5e33c3bdcbbc.tar.gz
otp-24ad2d1d985bbadb28dc8fe9dfee5e33c3bdcbbc.tar.bz2
otp-24ad2d1d985bbadb28dc8fe9dfee5e33c3bdcbbc.zip
Merge branch 'rickard/cerl-emacs-gdb' into maint
* rickard/cerl-emacs-gdb: Use annotate level 1 for 'gdb' with 'emacs' in 'cerl'
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/unix/cerl.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src
index 6a431ce4da..ffd48d5811 100644
--- a/erts/etc/unix/cerl.src
+++ b/erts/etc/unix/cerl.src
@@ -302,7 +302,7 @@ else
# Set annotation level for gdb in emacs 22 and higher.
emacs_major=`$EMACS --version | head -1 | sed 's,^[^0-9]*\([0-9]*\).*,\1,g'`
if [ '!' -z "$emacs_major" -a $emacs_major -gt 21 ]; then
- GDBARGS="--annotate=3 "
+ GDBARGS="--annotate=1 "
fi
gdbcmd="$gdbcmd $GDBBP \
(insert-string \"source $ROOTDIR/erts/etc/unix/etp-commands\") \