diff options
Diffstat (limited to 'lisp/vc/ediff.el')
| -rw-r--r-- | lisp/vc/ediff.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index 46ad94c1828..40473a2c03f 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el @@ -106,8 +106,6 @@ ;;; Code: (require 'ediff-util) -;; end pacifier - (require 'ediff-init) (require 'ediff-mult) ; required because of the registry stuff @@ -282,7 +280,8 @@ deleted. Returns the buffer into which the file is visited. Also sets `ediff--magic-file-name' to indicate where the file's content has been saved (if not in `buffer-file-name')." - (let* ((file-magic (ediff-filename-magic-p file)) + (let* ((file-magic (or (ediff-file-compressed-p file) + (file-remote-p file))) (temp-file-name-prefix (file-name-nondirectory file))) (cond ((not (file-readable-p file)) (user-error "File `%s' does not exist or is not readable" file)) @@ -1557,7 +1556,9 @@ With optional NODE, goes to that node." (info "ediff") (if node (Info-goto-node node) - (message "Type `i' to search for a specific topic")) + (message (substitute-command-keys + (concat "Type \\<Info-mode-map>\\[Info-index] to" + " search for a specific topic")))) (raise-frame)) (error (beep 1) (with-output-to-temp-buffer ediff-msg-buffer |