# HG changeset patch
# User J.D. Smith <jdsmith@as.arizona.edu>
# Date 1177610310 0
# Node ID 9c6bda5df946273e519cee38bdd5f206d256801b
# Parent  fd453ee2ddc8d2ddac06bb021aba67f47fc85123
Merge in change report to idlwave.el from trunk.

diff -r fd453ee2ddc8 -r 9c6bda5df946 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Apr 26 17:54:40 2007 +0000
+++ b/lisp/ChangeLog	Thu Apr 26 17:58:30 2007 +0000
@@ -11,6 +11,13 @@
 
 	* hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'.
 
+2007-04-25  J.D. Smith  <jdsmith@as.arizona.edu>
+
+	* progmodes/idlwave.el (idlwave-beginning-of-subprogram)
+	(idlwave-end-of-subprogram): Take optional NOMARK arg to prevent
+	pushing mark.
+	(idlwave-current-routine): Don't push mark.
+
 2007-04-25  Mathias Dahl  <mathias.dahl@gmail.com>
 
 	* image-dired.el (image-dired-display-image): Derive image-type