comparison lisp/dired-x.el @ 49485:7c879dba798f

(dired-filename-at-point): Fix last change and tidy up.

49484:4e26b69ee15d

  (interactive (list (read-filename-at-point "Find file: ")))
  (find-file-other-window (expand-file-name filename)))

;;; Internal functions.

;; 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 "-.[:alnum:]_/:$+@")
        (bol (save-excursion (beginning-of-line) (point)))
        (eol (save-excursion (end-of-line) (point)))
        start end filename prefix)

    (save-excursion
      ;; First see if just past a filename.
      (if (not (eobp))

                    (backward-char 1)))))

      (if (string-match (concat "[" filename-chars "]")
                        (char-to-string (following-char)))
          (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))

        (error "No file found around point!"))

      ;; Return string.
      (expand-file-name (concat prefix (buffer-substring start (point)))))))

49485:7c879dba798f

  (interactive (list (read-filename-at-point "Find file: ")))
  (find-file-other-window (expand-file-name filename)))

;;; Internal functions.

;; Fixme: This should probably use `thing-at-point'.  -- 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 "-.[:alnum:]_/:$+@")
        start end filename prefix)

    (save-excursion
      ;; First see if just past a filename.
      (if (not (eobp))

                    (backward-char 1)))))

      (if (string-match (concat "[" filename-chars "]")
                        (char-to-string (following-char)))
          (progn
            (if (re-search-backward (concat "[^" filename-chars "]") nil t)
		(forward-char)
	      (goto-char (point-min)))
            (setq start (point))
	    (setq prefix
		  (and (string-match
			"^\\w+@"
			(buffer-substring start (line-beginning-position)))
		       "/"))
            (goto-char start)
            (if (string-match "[/~]" (char-to-string (preceding-char)))
                (setq start (1- start)))
            (re-search-forward (concat "\\=[" filename-chars "]*") nil t))

        (error "No file found around point!"))

      ;; Return string.
      (expand-file-name (concat prefix (buffer-substring start (point)))))))