(info-insert-file-contents-1) [MSDOS]: Remove leading

dot only from non-empty suffixes.

diff --git a/lisp/info.el b/lisp/info.el
index 62d87b3a7c14ad40b797cce23931b829d0d854c8..a99463c3254230ee55691fc40019e85a72c52952 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -159,9 +159,10 @@ be last in the list.")
           (ext-len (max 0 (- (length filename) (length sans-exts) 1)))
           ext-left)
       ;; SUFFIX starts with a dot.  If FILENAME already has one,
-      ;; get rid of the one in SUFFIX.
+      ;; get rid of the one in SUFFIX (unless suffix is empty).
       (or (and (<= ext-len 0)
               (not (eq (aref filename (1- (length filename))) ?.)))
+         (= (length suffix) 0)
          (setq suffix (substring suffix 1)))
       ;; How many chars of that extension should we keep?
       (setq ext-left (min ext-len (max 0 (- 3 (length suffix)))))