=== modified file 'lisp/ChangeLog'
*** lisp/ChangeLog	2013-04-30 16:27:36 +0000
--- lisp/ChangeLog	2013-05-01 01:29:01 +0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2013-04-30  Jean-Philippe Gravel  <jpgravel@gmail.com>
+ 
+ 	* progmodes/gdb-mi.el (gdb-input): Include token numbers in
+ 	gdb-debug-log.
+ 
  2013-04-30  Leo Liu  <sdl.web@gmail.com>
  
  	* progmodes/octave.el (inferior-octave-prompt-read-only): Fix last

=== modified file 'lisp/progmodes/gdb-mi.el'
*** lisp/progmodes/gdb-mi.el	2013-04-20 16:24:04 +0000
--- lisp/progmodes/gdb-mi.el	2013-05-01 01:48:31 +0000
***************
*** 1731,1740 ****
    "Send COMMAND to GDB via the MI interface.
  Run the function HANDLER-FUNCTION, with no arguments, once the command is
  complete."
-   (if gdb-enable-debug (push (list 'send-item command handler-function)
- 			     gdb-debug-log))
    (setq gdb-token-number (1+ gdb-token-number))
    (setq command (concat (number-to-string gdb-token-number) command))
    (push (cons gdb-token-number handler-function) gdb-handler-alist)
    (if gdbmi-debug-mode (message "gdb-input: %s" command))
    (process-send-string (get-buffer-process gud-comint-buffer)
--- 1731,1741 ----
    "Send COMMAND to GDB via the MI interface.
  Run the function HANDLER-FUNCTION, with no arguments, once the command is
  complete."
    (setq gdb-token-number (1+ gdb-token-number))
    (setq command (concat (number-to-string gdb-token-number) command))
+ 
+   (if gdb-enable-debug (push (list 'send-item command handler-function)
+ 			     gdb-debug-log))
    (push (cons gdb-token-number handler-function) gdb-handler-alist)
    (if gdbmi-debug-mode (message "gdb-input: %s" command))
    (process-send-string (get-buffer-process gud-comint-buffer)