diff options
| author | Patrik Nyblom <[email protected]> | 2010-10-08 16:54:07 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-10-08 16:54:07 +0200 |
| commit | 499082d25170aa7edf922a6aee0465a7ffb144d4 (patch) | |
| tree | 292bc620dea88bb3f5b206fd5b23421aff4a9857 /erts | |
| parent | 1993157ef34ca5a16c98630b622235da6a2c7384 (diff) | |
| parent | ba7c2beca25735327366ad7eac31bbd3a4898395 (diff) | |
| download | otp-499082d25170aa7edf922a6aee0465a7ffb144d4.tar.gz otp-499082d25170aa7edf922a6aee0465a7ffb144d4.tar.bz2 otp-499082d25170aa7edf922a6aee0465a7ffb144d4.zip | |
Merge branch 'pan/cerl-gdb-emacs/OTP-8882' into dev
* pan/cerl-gdb-emacs/OTP-8882:
Incorporate Michael Santos patch for cerl and gdb via emacs
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/unix/cerl.src | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/erts/etc/unix/cerl.src b/erts/etc/unix/cerl.src index 9dab9fcfcc..73b1bafbe0 100644 --- a/erts/etc/unix/cerl.src +++ b/erts/etc/unix/cerl.src @@ -66,6 +66,7 @@ core= GDB= GDBBP= +GDBARGS= TYPE= EMU_TYPE= debug= @@ -280,16 +281,11 @@ 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 - # Hack - wait for etp-commands to be loaded and then set - # annotation level, could be done more beautifully than with sit-for... - gdbcmd="$gdbcmd \ - (sit-for 1) \ - (insert-string \"set annotate 3\") \ - (comint-send-input)" + GDBARGS="--annotate=3 " fi gdbcmd="$gdbcmd $GDBBP \ (insert-string \"source $ROOTDIR/erts/etc/unix/etp-commands\") \ (comint-send-input)" # Fire up gdb in emacs... - exec $EMACS --eval "(progn (gdb \"gdb $EMU\") $gdbcmd)" + exec $EMACS --eval "(progn (gdb \"gdb $GDBARGS$EMU\") $gdbcmd)" fi |