3 files changed, 10 insertions, 6 deletions

diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index f3a540fc491..b7bf99efa2e 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -161,7 +161,7 @@
 ;; More compile-time-macros
 (eval-when-compile
   (defmacro save-buffer-state-x (&rest body) ; similar to EMACS/lazy-lock.el
-    (let ((modified (gensym "save-buffer-state-x-modified-")))
+    (let ((modified (with-no-warnings (gensym "save-buffer-state-x-modified-"))))
       `(let ((,modified (buffer-modified-p)))
          (unwind-protect
              (let ((buffer-undo-list t) (inhibit-read-only t)
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 48a007aef27..76e00cc4438 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -162,11 +162,14 @@ Used to grey out relevant toolbar icons.")
                      (gud-run . "gud-run")
                      (gud-until . "gud-until")
                      (gud-cont . "gud-cont")
-                     (gud-step . "gud-step")
-                     (gud-next . "gud-next")
+                     ;; gud-s, gud-si etc. instead of gud-step,
+                     ;; gud-stepi, to avoid file-name clashes on DOS
+                     ;; 8+3 filesystems.
+                     (gud-step . "gud-s")
+                     (gud-next . "gud-n")
                      (gud-finish . "gud-finish")
-                     (gud-stepi . "gud-stepi")
-                     (gud-nexti . "gud-nexti")
+                     (gud-stepi . "gud-si")
+                     (gud-nexti . "gud-ni")
                      (gud-up . "gud-up")
                      (gud-down . "gud-down"))
                    map)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index e63dda1c663..a23dc0a307e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2052,7 +2052,8 @@ STRING	     This is ignored for the purposes of calculating
                     (progn
                       (setq result (append result val))
                       (setq align-point (point))))
-                (forward-char -1)
+                (or (bobp)
+                    (forward-char -1))
                 (skip-chars-forward "[a-z0-9]*?")
                 )
                ((string-match "[])}]" x)