(describe-mode): Test mini-mode symbol for being

[gnu-emacs] / lisp / dired-x.el

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 808dc3b5dc87ae285fdd43fd7ee5ddd8161181c4..63d51c7716fb196fc5e1ae24c376adc690c3b2fa 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -968,7 +968,7 @@ dired."
    '("\\.shar.Z$" "zcat * | unshar")
    '("\\.shar.g?z$" "gunzip -qc * | unshar")
 
-   '("\\.e?ps$" "ghostview" "xv" "lpr")
+   '("\\.e?ps$" "ghostview" "xloadimage" "lpr")
    (list "\\.e?ps.g?z$" "gunzip -qc * | ghostview -"
          ;; Optional decompression.
          '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
@@ -991,10 +991,11 @@ dired."
    '("\\.sh$" "sh")                     ; execute shell scripts
    '("\\.xbm$" "bitmap")                ; view X11 bitmaps
    '("\\.gp$" "gnuplot")
-   '("\\.p[bgpn]m$" "xv")
-   '("\\.gif$" "xv")                    ; view gif pictures
-   '("\\.tif$" "xv")
-   '("\\.jpg$" "xv")
+   '("\\.p[bgpn]m$" "xloadimage")
+   '("\\.gif$" "xloadimage")                    ; view gif pictures
+   '("\\.tif$" "xloadimage")
+   '("\\.png$" "xloadimage")
+   '("\\.jpg$" "xloadimage")
    '("\\.fig$" "xfig")                  ; edit fig pictures
    '("\\.out$" "xgraph")                ; for plotting purposes.
    '("\\.tex$" "latex" "tex")
@@ -1610,10 +1611,10 @@ to test if that file exists.  Use minibuffer after snatching filename."
   ;; 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.
@@ -1629,6 +1630,11 @@ to test if that file exists.  Use minibuffer after snatching filename."
           (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))
@@ -1636,7 +1642,7 @@ to test if that file exists.  Use minibuffer after snatching filename."
         (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