Mercurial > emacs
changeset 27917:b54fc217c5c8
(dired-filename-at-point): Add `@' to valid
file name characters.
(dired-filename-at-point): Handle ange-ftp file names.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 01 Mar 2000 10:27:54 +0000 |
| parents | 3288a7cd4796 |
| children | a71031623500 |
| files | lisp/dired-x.el |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/dired-x.el Wed Mar 01 10:27:05 2000 +0000 +++ b/lisp/dired-x.el Wed Mar 01 10:27:54 2000 +0000 @@ -1611,10 +1611,10 @@ ;; 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---_/:$+") + (let ((filename-chars ".a-zA-Z0-9---_/:$+@") (bol (save-excursion (beginning-of-line) (point))) (eol (save-excursion (end-of-line) (point))) - start end filename) + start end filename prefix) (save-excursion ;; First see if just past a filename. @@ -1630,6 +1630,11 @@ (progn (skip-chars-backward filename-chars) (setq start (point)) + (setq prefix + (and (string-match "^\\w+@" + (buffer-substring start eol)) + "/")) + (goto-char start) (if (string-match "[/~]" (char-to-string (preceding-char))) (setq start (1- start))) (skip-chars-forward filename-chars)) @@ -1637,7 +1642,7 @@ (error "No file found around point!")) ;; Return string. - (expand-file-name (buffer-substring start (point)))))) + (expand-file-name (concat prefix (buffer-substring start (point))))))) (defun read-filename-at-point (prompt) ;;; Returns filename prompting with PROMPT with completion. If