From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 5 Dec 2016 15:06:04 +0000 (+0100)
Subject: Remove compat code in Tramp
X-Git-Tag: emacs-26.0.90~1204
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1b762de16642cd08a7fbc47e2e0c058af2e09a11;p=emacs.git

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 4ebae79d32a..a079b670641 100644
--- 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 61796a25bb3..e52296faaf7 100644
--- 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 a92b602e36a..1eb66cf59ef 100644
--- 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.