; Remove superfluous merge from emacs-25

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e101c42a494fd77140c846e821050b010ff3e474..4edca5a5998cd5f4e37372c932bf5318379a81e1 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3764,26 +3764,6 @@ This is used internally by `tramp-file-mode-from-int'."
       (when vec (tramp-message vec 7 "locale %s" (or locale "C")))
       (or locale "C"))))
 
-(defun tramp-get-local-locale (&optional vec)
-  ;; We use key nil for local connection properties.
-  (with-tramp-connection-property nil "locale"
-    (let ((candidates '("en_US.utf8" "C.utf8" "en_US.UTF-8"))
-         locale)
-      (with-temp-buffer
-       (unless (or (memq system-type '(windows-nt))
-                    (not (zerop (tramp-call-process
-                                 nil "locale" nil t nil "-a"))))
-         (while candidates
-           (goto-char (point-min))
-           (if (string-match (format "^%s\r?$" (regexp-quote (car candidates)))
-                             (buffer-string))
-               (setq locale (car candidates)
-                     candidates nil)
-             (setq candidates (cdr candidates))))))
-      ;; Return value.
-      (when vec (tramp-message vec 7 "locale %s" (or locale "C")))
-      (or locale "C"))))
-
 ;;;###tramp-autoload
 (defun tramp-check-cached-permissions (vec access)
   "Check `file-attributes' caches for VEC.