Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-330

1 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf96534421b..dd061934b7c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+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-02-01  Jason Rumney  <jasonr@gnu.org>
 
         * w32-fns.el: Partially revert 2007-11-10 change.