comparison lisp/dired.el @ 104922:c603ee2aac17

* keymap.c (QCadvertised_binding): New constant. (syms_of_keymap): Initialize it. (Fwhere_is_internal): Try and use bindings from :advertised-binding if applicable. * progmodes/xscheme.el (xscheme-evaluation-commands): Put a :advertised-binding property rather than using advertised-xscheme-send-previous-expression. (advertised-xscheme-send-previous-expression): Declare obsolete. * emulation/crisp.el (crisp-mode-map): Use `undo' rather than `advertised-undo'. (crisp-mode): Add corresponding bindings to undo's :advertised-binding instead. * dired.el (dired-mode-map): Put a :advertised-binding property rather than using dired-advertised-find-file. (dired-advertised-find-file): * simple.el (advertised-undo): * wid-edit.el (advertised-widget-backward): Declare obsolete. (widget-keymap): Put a :advertised-binding property rather than using advertised-widget-backward. * bindings.el (ctl-x-map): Put a :advertised-binding property rather than using advertised-undo. * tutorial.el (tutorial--default-keys): Adjust accordingly.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 11 Sep 2009 00:58:59 +0000
parents 91afee51b252
children 0325f606c9c1
comparison
equal deleted inserted replaced
104921:05feb973bfa0 104922:c603ee2aac17
1290 ;; Lower keys for commands not operating on all the marked files 1290 ;; Lower keys for commands not operating on all the marked files
1291 (define-key map "a" 'dired-find-alternate-file) 1291 (define-key map "a" 'dired-find-alternate-file)
1292 (define-key map "d" 'dired-flag-file-deletion) 1292 (define-key map "d" 'dired-flag-file-deletion)
1293 (define-key map "e" 'dired-find-file) 1293 (define-key map "e" 'dired-find-file)
1294 (define-key map "f" 'dired-find-file) 1294 (define-key map "f" 'dired-find-file)
1295 (define-key map "\C-m" 'dired-advertised-find-file) 1295 (define-key map "\C-m" 'dired-find-file)
1296 (put 'dired-find-file :advertised-binding "\C-m")
1296 (define-key map "g" 'revert-buffer) 1297 (define-key map "g" 'revert-buffer)
1297 (define-key map "h" 'describe-mode) 1298 (define-key map "h" 'describe-mode)
1298 (define-key map "i" 'dired-maybe-insert-subdir) 1299 (define-key map "i" 'dired-maybe-insert-subdir)
1299 (define-key map "j" 'dired-goto-file) 1300 (define-key map "j" 'dired-goto-file)
1300 (define-key map "k" 'dired-do-kill-lines) 1301 (define-key map "k" 'dired-do-kill-lines)
1683 Mark-using commands display a list of failures afterwards. Type \\[dired-summary] 1684 Mark-using commands display a list of failures afterwards. Type \\[dired-summary]
1684 to see why something went wrong. 1685 to see why something went wrong.
1685 Type \\[dired-unmark] to Unmark a file or all files of a subdirectory. 1686 Type \\[dired-unmark] to Unmark a file or all files of a subdirectory.
1686 Type \\[dired-unmark-backward] to back up one line and unflag. 1687 Type \\[dired-unmark-backward] to back up one line and unflag.
1687 Type \\[dired-do-flagged-delete] to eXecute the deletions requested. 1688 Type \\[dired-do-flagged-delete] to eXecute the deletions requested.
1688 Type \\[dired-advertised-find-file] to Find the current line's file 1689 Type \\[dired-find-file] to Find the current line's file
1689 (or dired it in another buffer, if it is a directory). 1690 (or dired it in another buffer, if it is a directory).
1690 Type \\[dired-find-file-other-window] to find file or dired directory in Other window. 1691 Type \\[dired-find-file-other-window] to find file or dired directory in Other window.
1691 Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer. 1692 Type \\[dired-maybe-insert-subdir] to Insert a subdirectory in this buffer.
1692 Type \\[dired-do-rename] to Rename a file or move the marked files to another directory. 1693 Type \\[dired-do-rename] to Rename a file or move the marked files to another directory.
1693 Type \\[dired-do-copy] to Copy files. 1694 Type \\[dired-do-copy] to Copy files.
1857 (if (file-symlink-p file-name) 1858 (if (file-symlink-p file-name)
1858 (error "File is a symlink to a nonexistent target") 1859 (error "File is a symlink to a nonexistent target")
1859 (error "File no longer exists; type `g' to update dired buffer"))))) 1860 (error "File no longer exists; type `g' to update dired buffer")))))
1860 1861
1861 ;; Force C-m keybinding rather than `f' or `e' in the mode doc: 1862 ;; Force C-m keybinding rather than `f' or `e' in the mode doc:
1862 (defalias 'dired-advertised-find-file 'dired-find-file) 1863 (define-obsolete-function-alias 'dired-advertised-find-file 'dired-find-file "23.2")
1863 (defun dired-find-file () 1864 (defun dired-find-file ()
1864 "In Dired, visit the file or directory named on this line." 1865 "In Dired, visit the file or directory named on this line."
1865 (interactive) 1866 (interactive)
1866 ;; Bind `find-file-run-dired' so that the command works on directories 1867 ;; Bind `find-file-run-dired' so that the command works on directories
1867 ;; too, independent of the user's setting. 1868 ;; too, independent of the user's setting.