Avoid switching files with ctrl-o

I like navigating through old cursor positions with ctrl-o and ctrl-i. However, I don't necessarily like the way it switches files sometimes. I end up writing the current file before switching files, and when I go back to the original file, Undo no longer works. Is there a way to prevent ctrl-o from switching files? How about preventing this only when ctrl-o is invoked from a macro such as one defined using one of the :map variations?

--
--
You received this message from the "vim_use" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

---
You received this message because you are subscribed to the Google Groups "vim_use" group.
To unsubscribe from this group and stop receiving emails from it, send an email to vim_use+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.