Mercurial > emacs
comparison lisp/dired.el @ 107010:238592f6c24a
Merge from trunk
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Thu, 14 Jan 2010 22:19:01 +0800 |
parents | 13cc2986cf43 |
children | 6657954b1aa2 |
comparison
equal
deleted
inserted
replaced
107009:3e16e7dbb4a5 | 107010:238592f6c24a |
---|---|
1 ;;; dired.el --- directory-browsing commands | 1 ;;; dired.el --- directory-browsing commands |
2 | 2 |
3 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000, | 3 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000, |
4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 | 4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
5 ;; Free Software Foundation, Inc. | 5 ;; Free Software Foundation, Inc. |
6 | 6 |
7 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> | 7 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de> |
8 ;; Maintainer: FSF | 8 ;; Maintainer: FSF |
9 ;; Keywords: files | 9 ;; Keywords: files |
3515 ;;;;;; dired-add-file dired-do-redisplay dired-do-load dired-do-byte-compile | 3515 ;;;;;; dired-add-file dired-do-redisplay dired-do-load dired-do-byte-compile |
3516 ;;;;;; dired-do-compress dired-query dired-compress-file dired-do-kill-lines | 3516 ;;;;;; dired-do-compress dired-query dired-compress-file dired-do-kill-lines |
3517 ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command | 3517 ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command |
3518 ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown | 3518 ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown |
3519 ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff | 3519 ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff |
3520 ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "c7d3d0354ca849c90d3aaf33fa06341d") | 3520 ;;;;;; dired-diff) "dired-aux" "dired-aux.el" "557aca1f6e86b39f1c7612ee123d5354") |
3521 ;;; Generated autoloads from dired-aux.el | 3521 ;;; Generated autoloads from dired-aux.el |
3522 | 3522 |
3523 (autoload 'dired-diff "dired-aux" "\ | 3523 (autoload 'dired-diff "dired-aux" "\ |
3524 Compare file at point with file FILE using `diff'. | 3524 Compare file at point with file FILE using `diff'. |
3525 FILE defaults to the file at the mark. (That's the mark set by | 3525 FILE defaults to the file at the mark. (That's the mark set by |
3968 \(fn FILE &optional DEREF-SYMLINKS)" t nil) | 3968 \(fn FILE &optional DEREF-SYMLINKS)" t nil) |
3969 | 3969 |
3970 ;;;*** | 3970 ;;;*** |
3971 | 3971 |
3972 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" | 3972 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" |
3973 ;;;;;; "c1bb83404017aa89655222b2b50471ed") | 3973 ;;;;;; "bb37ec379c0a523368794491b691fd8d") |
3974 ;;; Generated autoloads from dired-x.el | 3974 ;;; Generated autoloads from dired-x.el |
3975 | 3975 |
3976 (autoload 'dired-jump "dired-x" "\ | 3976 (autoload 'dired-jump "dired-x" "\ |
3977 Jump to dired buffer corresponding to current buffer. | 3977 Jump to dired buffer corresponding to current buffer. |
3978 If in a file, dired the current directory and move to file's line. | 3978 If in a file, dired the current directory and move to file's line. |