diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-25 11:31:36 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-06-25 11:31:36 -0700 |
| commit | 948b98fd3c17e56b5fa606eedbe6487091f2b66d (patch) | |
| tree | 470d98f5aa36d512902da3db4d9f35b3c0fe6f07 /lisp/net | |
| parent | 7a7ef429182915745380c3074771d9f747dab964 (diff) | |
| parent | 11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20 (diff) | |
| download | emacs-948b98fd3c17e56b5fa606eedbe6487091f2b66d.tar.gz | |
Merge from trunk.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 1 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 0493ead7bbf..1282f86d503 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3278,6 +3278,7 @@ system TYPE.") (name (ange-ftp-quote-string (nth 2 parsed))) (temp (ange-ftp-make-tmp-name host)) (binary (ange-ftp-binary-file filename)) + (buffer-file-type buffer-file-type) (abbr (ange-ftp-abbreviate-filename filename)) (coding-system-used last-coding-system-used) size) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index d9e6827d2df..ac12030471e 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -322,7 +322,7 @@ Defaults to the value of `browse-url-mozilla-arguments' at the time :group 'browse-url) (defcustom browse-url-firefox-program - (let ((candidates '("firefox" "iceweasel"))) + (let ((candidates '("firefox" "iceweasel" "icecat"))) (while (and candidates (not (executable-find (car candidates)))) (setq candidates (cdr candidates))) (or (car candidates) "firefox")) |