[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117111: * net/browse-url.el (browse-url):
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-24 r117111: * net/browse-url.el (browse-url): |
Date: |
Tue, 13 May 2014 08:54:13 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117111
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17425
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-05-13 10:54:08 +0200
message:
* net/browse-url.el (browse-url):
Use `unhandled-file-name-directory' when setting `default-directory',
in order to circumvent stalled remote connections.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/browse-url.el
browseurl.el-20091113204419-o5vbwnq5f7feedwu-1785
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-12 05:25:34 +0000
+++ b/lisp/ChangeLog 2014-05-13 08:54:08 +0000
@@ -1,3 +1,9 @@
+2014-05-13 Michael Albinus <address@hidden>
+
+ * net/browse-url.el (browse-url):
+ Use `unhandled-file-name-directory' when setting `default-directory',
+ in order to circumvent stalled remote connections. (Bug#17425)
+
2014-05-12 Stefan Monnier <address@hidden>
* emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled
@@ -97,7 +103,7 @@
Remove HISTFILE and HISTSIZE; it's too late to set them here.
Add :version entry.
(tramp-open-shell): Do not let-bind `tramp-end-of-output'.
- Add "HISTSIZE=/dev/null" to the shell's env arguments. Do not send
+ Add "HISTFILE=/dev/null" to the shell's env arguments. Do not send
extra "PSx=..." commands.
(tramp-maybe-open-connection): Setenv HISTFILE to /dev/null.
(Bug#17295)
=== modified file 'lisp/net/browse-url.el'
--- a/lisp/net/browse-url.el 2014-05-10 20:48:36 +0000
+++ b/lisp/net/browse-url.el 2014-05-13 08:54:08 +0000
@@ -807,15 +807,15 @@
(interactive (browse-url-interactive-arg "URL: "))
(unless (called-interactively-p 'interactive)
(setq args (or args (list browse-url-new-window-flag))))
+ (when (and url-handler-mode (not (file-name-absolute-p url)))
+ (setq url (expand-file-name url)))
(let ((process-environment (copy-sequence process-environment))
(function (or (and (string-match "\\`mailto:" url)
browse-url-mailto-function)
browse-url-browser-function))
;; Ensure that `default-directory' exists and is readable (b#6077).
- (default-directory (if (and (file-directory-p default-directory)
- (file-readable-p default-directory))
- default-directory
- (expand-file-name "~/"))))
+ (default-directory (or (unhandled-file-name-directory default-directory)
+ (expand-file-name "~/"))))
;; When connected to various displays, be careful to use the display of
;; the currently selected frame, rather than the original start display,
;; which may not even exist any more.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117111: * net/browse-url.el (browse-url):,
Michael Albinus <=