JimB's changes since January 18th

3 files changed, 10 insertions, 8 deletions

diff --git a/lisp/progmodes/c-mode.el b/lisp/progmodes/c-mode.el
index 7bdfbdf8031..b39182f02af 100644
--- a/lisp/progmodes/c-mode.el
+++ b/lisp/progmodes/c-mode.el
@@ -322,11 +322,13 @@ preserving the comment indentation or line-starting decorations."
               (paragraph-start
                ;; Lines containing just a comment start or just an end
                ;; should not be filled into paragraphs they are next to.
-               (concat paragraph-start
-                       "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[^ \t/*]"))
+               (concat 
+                paragraph-start
+                "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$"))
               (paragraph-separate
-               (concat paragraph-separate
-                       "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[^ \t/*]"))
+               (concat
+                paragraph-separate
+                "\\|^[ \t]*/\\*[ \t]*$\\|^[ \t]*\\*/[ \t]*$\\|^[ \t/*]*$"))
               (chars-to-delete 0))
           (save-restriction
             ;; Don't fill the comment together with the code following it.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 96addc99e42..5a0aa4511f8 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -39,7 +39,7 @@
 ;;; This file may be used with GNU Emacs version 18.xx if the following
 ;;; variable and function substutions are made.
 ;;;    Replace:
-;;;             unread-command-event with unread-command-char
+;;;             unread-command-events with unread-command-char
 ;;;             frame-width          with screen-width
 ;;;             auto-fill-function   with auto-fill-hook
 
@@ -469,7 +469,7 @@ Any other key combination is executed normally."
     (if (or (= (setq c (read-char)) ??) ;insert char if not equal to `?'
             (= c help-char))
         (fortran-abbrev-help)
-      (setq unread-command-event c))))
+      (setq unread-command-events (list c)))))
 
 (defun fortran-abbrev-help ()
   "List the currently defined abbrevs in Fortran mode."
@@ -535,7 +535,7 @@ See also `fortran-window-create'."
             (progn (message "Type SPC to continue editing.")
                    (let ((char (read-char)))
                      (or (equal char (string-to-char " "))
-                         (setq unread-command-event char))))))
+                         (setq unread-command-events (list char)))))))
     (fortran-window-create)))
 
 (defun fortran-split-line ()
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index 4873ce1a1dc..7649c0ca048 100644
--- 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-event (read-char)))
+        (next-char (setq unread-command-events (list (read-char))))
         (com-char last-command-char))
     (unwind-protect
         ;; Problem: find out if character just read is a command char