# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1201841070 0
# Node ID 33d1c8d91e5e0deef92f302fdf078b3cd228a801
# Parent  924fe8b4e375721131b2920b0901490cf87f63e2# Parent  5c60e04e322f716f42e660438f3541b5426dbc6d
Merge from emacs--devo--0

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

diff -r 924fe8b4e375 -r 33d1c8d91e5e lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Feb 01 03:01:11 2008 +0000
+++ b/lisp/ChangeLog	Fri Feb 01 04:44:30 2008 +0000
@@ -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.
diff -r 924fe8b4e375 -r 33d1c8d91e5e lisp/doc-view.el
--- a/lisp/doc-view.el	Fri Feb 01 03:01:11 2008 +0000
+++ b/lisp/doc-view.el	Fri Feb 01 04:44:30 2008 +0000
@@ -943,7 +943,8 @@
 (defun doc-view-mode ()
   "Major mode in DocView buffers.
 You can use \\<doc-view-mode-map>\\[doc-view-toggle-display] to
-toggle between displaying the document or editing it as text."
+toggle between displaying the document or editing it as text.
+\\{doc-view-mode-map}"
   (interactive)
 
   (let* ((prev-major-mode (if (eq major-mode 'doc-view-mode)
diff -r 924fe8b4e375 -r 33d1c8d91e5e lisp/progmodes/verilog-mode.el
--- a/lisp/progmodes/verilog-mode.el	Fri Feb 01 03:01:11 2008 +0000
+++ b/lisp/progmodes/verilog-mode.el	Fri Feb 01 04:44:30 2008 +0000
@@ -9539,7 +9539,7 @@
 
 (define-skeleton verilog-sk-prompt-msb
   "Prompt for least significant bit specification."
-  "msb:" str & ?: & (verilog-sk-prompt-lsb) | -1 )
+  "msb:" str & ?: & '(verilog-sk-prompt-lsb) | -1 )
 
 (define-skeleton verilog-sk-prompt-lsb
   "Prompt for least significant bit specification."
@@ -9578,21 +9578,21 @@
 (define-skeleton verilog-sk-module
   "Insert a module definition."
   ()
-  > "module " (verilog-sk-prompt-name) " (/*AUTOARG*/ ) ;" \n
+  > "module " '(verilog-sk-prompt-name) " (/*AUTOARG*/ ) ;" \n
   > _ \n
   > (- verilog-indent-level-behavioral) "endmodule" (progn (electric-verilog-terminate-line) nil))
 
 (define-skeleton verilog-sk-primitive
   "Insert a task definition."
   ()
-  > "primitive " (verilog-sk-prompt-name) " ( " (verilog-sk-prompt-output) ("input:" ", " str ) " );"\n
+  > "primitive " '(verilog-sk-prompt-name) " ( " '(verilog-sk-prompt-output) ("input:" ", " str ) " );"\n
   > _ \n
   > (- verilog-indent-level-behavioral) "endprimitive" (progn (electric-verilog-terminate-line) nil))
 
 (define-skeleton verilog-sk-task
   "Insert a task definition."
   ()
-  > "task " (verilog-sk-prompt-name) & ?; \n
+  > "task " '(verilog-sk-prompt-name) & ?; \n
   > _ \n
   > "begin" \n
   > \n
@@ -9602,7 +9602,7 @@
 (define-skeleton verilog-sk-function
   "Insert a function definition."
   ()
-  > "function [" (verilog-sk-prompt-width) | -1 (verilog-sk-prompt-name) ?; \n
+  > "function [" '(verilog-sk-prompt-width) | -1 '(verilog-sk-prompt-name) ?; \n
   > _ \n
   > "begin" \n
   > \n
@@ -9642,7 +9642,7 @@
 (define-skeleton verilog-sk-begin
   "Insert begin end block.  Uses the minibuffer to prompt for name"
   ()
-  > "begin" (verilog-sk-prompt-name) \n
+  > "begin" '(verilog-sk-prompt-name) \n
   > _ \n
   > (- verilog-indent-level-behavioral) "end"
 )
@@ -9687,42 +9687,42 @@
 
 (define-skeleton verilog-sk-if
   "Insert a skeleton if statement."
-  > "if (" (verilog-sk-prompt-condition) & ")" " begin" \n
+  > "if (" '(verilog-sk-prompt-condition) & ")" " begin" \n
   > _ \n
   > (- verilog-indent-level-behavioral) "end " \n )
 
 (define-skeleton verilog-sk-else-if
   "Insert a skeleton else if statement."
   > (verilog-indent-line) "else if ("
-  (progn (setq verilog-sk-p (point)) nil) (verilog-sk-prompt-condition) (if (> (point) verilog-sk-p) ") " -1 ) & " begin" \n
+  (progn (setq verilog-sk-p (point)) nil) '(verilog-sk-prompt-condition) (if (> (point) verilog-sk-p) ") " -1 ) & " begin" \n
   > _ \n
   > "end" (progn (electric-verilog-terminate-line) nil))
 
 (define-skeleton verilog-sk-datadef
   "Common routine to get data definition"
   ()
-  (verilog-sk-prompt-width) | -1 ("name (RET to end):" str ", ") -2 ";" \n)
+  '(verilog-sk-prompt-width) | -1 ("name (RET to end):" str ", ") -2 ";" \n)
 
 (define-skeleton verilog-sk-input
   "Insert an input definition."
   ()
-  > "input  [" (verilog-sk-datadef))
+  > "input  [" '(verilog-sk-datadef))
 
 (define-skeleton verilog-sk-output
   "Insert an output definition."
   ()
-  > "output [" (verilog-sk-datadef))
+  > "output [" '(verilog-sk-datadef))
 
 (define-skeleton verilog-sk-inout
   "Insert an inout definition."
   ()
-  > "inout  [" (verilog-sk-datadef))
+  > "inout  [" '(verilog-sk-datadef))
 
 (defvar verilog-sk-signal nil)
 (define-skeleton verilog-sk-def-reg
   "Insert a reg definition."
   ()
-  > "reg    [" (verilog-sk-prompt-width) | -1 verilog-sk-signal ";" \n (verilog-pretty-declarations) )
+  > "reg    [" '(verilog-sk-prompt-width) | -1 verilog-sk-signal ";" \n (verilog-pretty-declarations) )
 
 (defun verilog-sk-define-signal ()
   "Insert a definition of signal under point at top of module."
@@ -9748,29 +9748,29 @@
 (define-skeleton verilog-sk-wire
   "Insert a wire definition."
   ()
-  > "wire   [" (verilog-sk-datadef))
+  > "wire   [" '(verilog-sk-datadef))
 
 (define-skeleton verilog-sk-reg
   "Insert a reg definition."
   ()
-  > "reg   [" (verilog-sk-datadef))
+  > "reg   [" '(verilog-sk-datadef))
 
 (define-skeleton verilog-sk-assign
   "Insert a skeleton assign statement."
   ()
-  > "assign " (verilog-sk-prompt-name) " = " _ ";" \n)
+  > "assign " '(verilog-sk-prompt-name) " = " _ ";" \n)
 
 (define-skeleton verilog-sk-while
   "Insert a skeleton while loop statement."
   ()
-  > "while ("  (verilog-sk-prompt-condition)  ") begin" \n
+  > "while ("  '(verilog-sk-prompt-condition)  ") begin" \n
   > _ \n
   > (- verilog-indent-level-behavioral) "end " (progn (electric-verilog-terminate-line) nil))
 
 (define-skeleton verilog-sk-repeat
   "Insert a skeleton repeat loop statement."
   ()
-  > "repeat ("  (verilog-sk-prompt-condition)  ") begin" \n
+  > "repeat ("  '(verilog-sk-prompt-condition)  ") begin" \n
   > _ \n
   > (- verilog-indent-level-behavioral) "end " (progn (electric-verilog-terminate-line) nil))
 
@@ -9778,9 +9778,9 @@
   "Insert a skeleton while loop statement."
   ()
   > "for ("
-  (verilog-sk-prompt-init) "; "
-  (verilog-sk-prompt-condition) "; "
-  (verilog-sk-prompt-inc)
+  '(verilog-sk-prompt-init) "; "
+  '(verilog-sk-prompt-condition) "; "
+  '(verilog-sk-prompt-inc)
   ") begin" \n
   > _ \n
   > (- verilog-indent-level-behavioral) "end " (progn (electric-verilog-terminate-line) nil))
@@ -9798,7 +9798,7 @@
   '(setq input "state")
   > "// State registers for " str | -23 \n
   '(setq verilog-sk-state str)
-  > "reg [" (verilog-sk-prompt-width) | -1 verilog-sk-state ", next_" verilog-sk-state ?; \n
+  > "reg [" '(verilog-sk-prompt-width) | -1 verilog-sk-state ", next_" verilog-sk-state ?; \n
   '(setq input nil)
   > \n
   > "// State FF for " verilog-sk-state \n
@@ -9809,7 +9809,7 @@
   > \n
   > "// Next State Logic for " verilog-sk-state \n
   > "always @ ( /*AUTOSENSE*/ ) begin\n"
-  > "case (" (verilog-sk-prompt-state-selector) ") " \n
+  > "case (" '(verilog-sk-prompt-state-selector) ") " \n
   > ("case selector: " str ": begin" \n > "next_" verilog-sk-state " = " _ ";" \n > (- verilog-indent-level-behavioral) "end" \n )
   resume: >  (- verilog-case-indent) "endcase" (progn (electric-verilog-terminate-line) nil)
   > (- verilog-indent-level-behavioral) "end" (progn (electric-verilog-terminate-line) nil))
diff -r 924fe8b4e375 -r 33d1c8d91e5e src/ChangeLog
--- a/src/ChangeLog	Fri Feb 01 03:01:11 2008 +0000
+++ b/src/ChangeLog	Fri Feb 01 04:44:30 2008 +0000
@@ -1,3 +1,7 @@
+2008-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* xfaces.c (face_at_buffer_position): Remove unused vars.
+
 2008-02-01  Kenichi Handa  <handa@ni.aist.go.jp>
 
 	* ccl.c (CCL_WRITE_CHAR): Fix overflow checking.
diff -r 924fe8b4e375 -r 33d1c8d91e5e src/xfaces.c
--- a/src/xfaces.c	Fri Feb 01 03:01:11 2008 +0000
+++ b/src/xfaces.c	Fri Feb 01 04:44:30 2008 +0000
@@ -8220,8 +8220,6 @@
   struct frame *f = XFRAME (w->frame);
   Lisp_Object attrs[LFACE_VECTOR_SIZE];
   Lisp_Object prop, position;
-  int i, noverlays;
-  Lisp_Object *overlay_vec;
   Lisp_Object frame;
   int endpos;
   Lisp_Object propname = mouse ? Qmouse_face : Qface;