--- gforth/gforth.el	2010/09/29 21:47:42	1.83
+++ gforth/gforth.el	2011/12/31 15:29:25	1.86
@@ -1,6 +1,6 @@
 ;;; gforth.el --- major mode for editing (G)Forth sources
 
-;; Copyright (C) 1995,1996,1997,1998,2000,2001,2003,2004,2007,2008 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998,2000,2001,2003,2004,2007,2008,2010,2011 Free Software Foundation, Inc.
 
 ;; This file is part of Gforth.
 
@@ -1388,7 +1388,7 @@ programmers who tend to fill code won't
 (defun forth-remove-tracers ()
   "Remove tracers of the form `~~ '. Queries the user for each occurrence."
   (interactive)
-  (query-replace-regexp "\\(~~ \\| ~~$\\)" "" nil))
+  (query-replace-regexp "\\(~~[ \t]\\|[ \t]~~$\\)" "" nil))
 
 (define-key forth-mode-map "\C-x\C-e" 'compile)
 (define-key forth-mode-map "\C-x\C-n" 'next-error)