Remove compat code in Tramp

* lisp/net/tramp.el (tramp-parse-time-months): Remove.

* lisp/net/tramp-compat.el (top): Require parse-time.

* lisp/net/tramp-smb.el (tramp-smb-read-file-entry):
Use `parse-time-months'.

diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index 4ebae79d32a3d20a1586f062a8d8a5f5a5e7805b..a079b6706419b4313be711afaf5070ce61cca356 100644 (file)
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -37,6 +37,7 @@
 (require 'advice)
 (require 'custom)
 (require 'format-spec)
+(require 'parse-time)
 (require 'password-cache)
 (require 'shell)
 (require 'timer)

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 61796a25bb3b90389a049210890f667bf806b559..e52296faaf78685303b7fbad4e90f7226b1ee211 100644 (file)
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1724,7 +1724,7 @@ Result is the list (LOCALNAME MODE SIZE MTIME)."
            (if (and sec min hour day month year)
                (encode-time
                 sec min hour day
-                (cdr (assoc (downcase month) tramp-parse-time-months))
+                (cdr (assoc (downcase month) parse-time-months))
                 year)
              '(0 0)))
       (list localname mode size mtime))))

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index a92b602e36a959409860d51d3d86e1cba3e38b9a..1eb66cf59ef1a435572b402b727a00d86f3723ba 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4292,18 +4292,11 @@ Invokes `password-read' if available, `read-passwd' else."
        'auth-source-forget-user-or-password "password" host method))
     (password-cache-remove (tramp-make-tramp-file-name method user host ""))))
 
-;; Snarfed code from time-date.el and parse-time.el
+;; Snarfed code from time-date.el.
 
 (defconst tramp-half-a-year '(241 17024)
 "Evaluated by \"(days-to-time 183)\".")
 
-(defconst tramp-parse-time-months
-  '(("jan" . 1) ("feb" . 2) ("mar" . 3)
-    ("apr" . 4) ("may" . 5) ("jun" . 6)
-    ("jul" . 7) ("aug" . 8) ("sep" . 9)
-    ("oct" . 10) ("nov" . 11) ("dec" . 12))
-  "Alist mapping month names to integers.")
-
 ;;;###tramp-autoload
 (defun tramp-time-diff (t1 t2)
   "Return the difference between the two times, in seconds.