[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bd2b14f: ; Remove superfluous merge from emacs-25
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] master bd2b14f: ; Remove superfluous merge from emacs-25 |
Date: |
Wed, 06 Apr 2016 08:26:15 +0000 |
branch: master
commit bd2b14f20726e0f210a62edc610fac4c5bc45760
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
; Remove superfluous merge from emacs-25
---
lisp/net/tramp.el | 20 --------------------
1 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e101c42..4edca5a 100644
--- 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.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master bd2b14f: ; Remove superfluous merge from emacs-25,
Michael Albinus <=