aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2012-07-31 22:12:20 +0200
committerRickard Green <[email protected]>2012-07-31 22:12:20 +0200
commita18ed48cd078f87745fd3a119489f898eea72eaa (patch)
tree1001b75bb0545e46e748a8f5810294b7fa925421 /erts/etc
parent8082d20dcf47a143290cd0362ec014dfa998e0f4 (diff)
parent24ad2d1d985bbadb28dc8fe9dfee5e33c3bdcbbc (diff)
downloadotp-a18ed48cd078f87745fd3a119489f898eea72eaa.tar.gz
otp-a18ed48cd078f87745fd3a119489f898eea72eaa.tar.bz2
otp-a18ed48cd078f87745fd3a119489f898eea72eaa.zip
Merge branch 'maint'
* maint: Use annotate level 1 for 'gdb' with 'emacs' in 'cerl'
Diffstat (limited to 'erts/etc')
-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\") \