Mercurial > emacs
comparison lisp/dired.el @ 111449:132f2dfd549f
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 09 Nov 2010 15:07:10 -0500 |
parents | 249a1455856a |
children | 2b266010d0b7 |
comparison
equal
deleted
inserted
replaced
111448:321fbae3e04d | 111449:132f2dfd549f |
---|---|
3537 ;;;;;; dired-add-file dired-do-redisplay dired-do-load dired-do-byte-compile | 3537 ;;;;;; dired-add-file dired-do-redisplay dired-do-load dired-do-byte-compile |
3538 ;;;;;; dired-do-compress dired-query dired-compress-file dired-do-kill-lines | 3538 ;;;;;; dired-do-compress dired-query dired-compress-file dired-do-kill-lines |
3539 ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command | 3539 ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command |
3540 ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown | 3540 ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown |
3541 ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff | 3541 ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff |
3542 ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "416d272299fd4774c47c2f677ee640a4") | 3542 ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "1628b7a7d379fb4da8ae4bf29faad4b5") |
3543 ;;; Generated autoloads from dired-aux.el | 3543 ;;; Generated autoloads from dired-aux.el |
3544 | 3544 |
3545 (autoload 'dired-diff "dired-aux" "\ | 3545 (autoload 'dired-diff "dired-aux" "\ |
3546 Compare file at point with file FILE using `diff'. | 3546 Compare file at point with file FILE using `diff'. |
3547 FILE defaults to the file at the mark. (That's the mark set by | 3547 FILE defaults to the file at the mark. (That's the mark set by |