2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3d2cb34730d..488bd07a632 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,9 @@
         * progmodes/perl-mode.el (perl-imenu-generic-expression): Only
         match variables declared via `my' or `our' (Bug#8261).
 
+        * net/browse-url.el (browse-url-of-dired-file): Allow browsing of
+        special file names `.' and `..' (Bug#8259).
+
 2011-05-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * progmodes/grep.el (grep-mode-font-lock-keywords): Remove
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 8f91fbb26b1..c1ec3f0ed13 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -769,7 +769,10 @@ narrowed."
 (defun browse-url-of-dired-file ()
   "In Dired, ask a WWW browser to display the file named on this line."
   (interactive)
-  (browse-url-of-file (dired-get-filename)))
+  (let ((tem (dired-get-filename t t)))
+    (if tem
+        (browse-url-of-file (expand-file-name tem))
+      (error "No file on this line"))))
 
 ;;;###autoload
 (defun browse-url-of-region (min max)