Mercurial > emacs
comparison lisp/dired.el @ 90996:f55f9811f5d7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 27 Jul 2007 10:52:18 +0000 |
parents | e9f94688a064 b98604865ea0 |
children | 539530fa389c |
comparison
equal
deleted
inserted
replaced
90995:9a391d85a79f | 90996:f55f9811f5d7 |
---|---|
9 | 9 |
10 ;; This file is part of GNU Emacs. | 10 ;; This file is part of GNU Emacs. |
11 | 11 |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | 12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
13 ;; it under the terms of the GNU General Public License as published by | 13 ;; it under the terms of the GNU General Public License as published by |
14 ;; the Free Software Foundation; either version 2, or (at your option) | 14 ;; the Free Software Foundation; either version 3, or (at your option) |
15 ;; any later version. | 15 ;; any later version. |
16 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | 17 ;; GNU Emacs is distributed in the hope that it will be useful, |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | 18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1245 (define-key map [up] 'dired-previous-line) | 1245 (define-key map [up] 'dired-previous-line) |
1246 ;; hiding | 1246 ;; hiding |
1247 (define-key map "$" 'dired-hide-subdir) | 1247 (define-key map "$" 'dired-hide-subdir) |
1248 (define-key map "\M-$" 'dired-hide-all) | 1248 (define-key map "\M-$" 'dired-hide-all) |
1249 ;; misc | 1249 ;; misc |
1250 (define-key map "\C-x\C-q" 'wdired-change-to-wdired-mode) | |
1250 (define-key map "?" 'dired-summary) | 1251 (define-key map "?" 'dired-summary) |
1251 (define-key map "\177" 'dired-unmark-backward) | 1252 (define-key map "\177" 'dired-unmark-backward) |
1252 (define-key map [remap undo] 'dired-undo) | 1253 (define-key map [remap undo] 'dired-undo) |
1253 (define-key map [remap advertised-undo] 'dired-undo) | 1254 (define-key map [remap advertised-undo] 'dired-undo) |
1254 ;; thumbnail manipulation (image-dired) | 1255 ;; thumbnail manipulation (image-dired) |