* bytecomp.el: Declare unread-command-char an obsolete variable.

	* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
	vip-prefix-arg-com): Use unread-command-event instead of
	unread-command-char; respect its new semantics.
	* simula.el (simula-electric-label): Same.

	* simula.el (simula-calculate-indent): Call backward-word with the
	appropriate argument.

diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index 97404a4..4873ce1 100644 (file)
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -401,7 +401,7 @@ The relative indentation among the lines of the statement are preserved."
        (case-fold-search t)
        ;; don't mix a label with an assignment operator := :-
        ;; therefore look at next typed character...
-       (next-char (setq unread-command-char (read-char)))
+       (next-char (setq unread-command-event (read-char)))
        (com-char last-command-char))
     (unwind-protect
        ;; Problem: find out if character just read is a command char
@@ -721,7 +721,7 @@ If COUNT is negative, move forward instead (simula-next-statement)"
                 (not (eq (preceding-char) ?\;))
                 (if (memq (preceding-char) '(?N ?n))
                     (save-excursion
-                      (backward-word)
+                      (backward-word 1)
                       (not (looking-at "begin\\>")))
                   t))
            (progn