(dired-filename-at-point): Fix filename-chars.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a633d951b4d..1f7c1fdd26b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2003-01-15  Dave Love  <fx@gnu.org>
 
+        * thingatpt.el (thing-at-point-file-name-chars): Include non-ASCII
+        and use documented treatment of -.
+
+        * dired-x.el (dired-filename-at-point): Fix filename-chars.
+
         * international/ucs-tables.el: Set up tables for 8859-6.
 
         * server.el (server-window): Customize.
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 6f0384be784..256064a3d6f 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1560,13 +1560,15 @@ to test if that file exists.  Use minibuffer after snatching filename."
   (find-file-other-window (expand-file-name filename)))
 
 ;;; Internal functions.
-(defun dired-filename-at-point ()
 
+;; Fixme: This should probably be replaced with `thing-at-point', but
+;; that needs checking for compatibility.  -- fx
+(defun dired-filename-at-point ()
   "Get the filename closest to point, but do not change position.
 Has a preference for looking backward when not directly on a symbol.  Not
 perfect - point must be in middle of or end of filename."
 
-  (let ((filename-chars ".a-zA-Z0-9---_/:$+@") ; fixme: allow non-ASCII
+  (let ((filename-chars "-.[:alnum:]_/:$+@")
         (bol (save-excursion (beginning-of-line) (point)))
         (eol (save-excursion (end-of-line) (point)))
         start end filename prefix)