From: Miles Bader <miles@gnu.org>
Date: Fri, 1 Feb 2008 04:43:42 +0000 (+0000)
Subject: Merge from emacs--rel--22
X-Git-Tag: emacs-pretest-23.0.90~8302
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bf120ed1b9f1fa5a2422465e7ca825080b7b0c65;p=emacs.git

Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1034
---

bf120ed1b9f1fa5a2422465e7ca825080b7b0c65
diff --cc lisp/ChangeLog
index d4d4b0861d9,407e9496e13..8544ecc8d6a
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,4 -1,17 +1,12 @@@
 -2008-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 -
 -	* simple.el (reindent-then-newline-and-indent): Be careful about the
 -	unusual case where indent-according-to-mode moves point.
 -
+ 2008-02-01  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+ 	* progmodes/verilog-mode.el (verilog-sk-prompt-msb)
+ 	(verilog-sk-module, verilog-sk-function, verilog-sk-begin)
+ 	(verilog-sk-if, verilog-sk-wire, verilog-sk-for)
+ 	(verilog-sk-state-machine): Quote all calls to
+ 	"auxiliary skeleton"s to prevent infloops.
+ 
 -2008-01-31  Jason Rumney  <jasonr@gnu.org>
 +2008-02-01  Jason Rumney  <jasonr@gnu.org>
  
  	* w32-fns.el: Partially revert 2007-11-10 change.