This diff renames the dired-* command names to be in line with emacs.
Any objections?
mark
Index: dired.c
===================================================================
RCS file: /cvs/src/usr.bin/mg/dired.c,v
retrieving revision 1.59
diff -u -p -r1.59 dired.c
--- dired.c 30 May 2013 17:43:43 -0000 1.59
+++ dired.c 2 Jun 2013 08:07:53 -0000
@@ -183,20 +183,20 @@ void
dired_init(void)
{
funmap_add(dired, "dired");
- funmap_add(d_undelbak, "dired-backup-unflag");
+ funmap_add(d_undelbak, "dired-unmark-backward");
funmap_add(d_create_directory, "dired-create-directory");
- funmap_add(d_copy, "dired-copy-file");
- funmap_add(d_expunge, "dired-do-deletions");
+ funmap_add(d_copy, "dired-do-copy");
+ funmap_add(d_expunge, "dired-do-flagged-delete");
funmap_add(d_findfile, "dired-find-file");
funmap_add(d_ffotherwindow, "dired-find-file-other-window");
- funmap_add(d_del, "dired-flag-file-deleted");
+ funmap_add(d_del, "dired-flag-file-deletion");
funmap_add(d_forwline, "dired-next-line");
funmap_add(d_otherwindow, "dired-other-window");
funmap_add(d_backline, "dired-previous-line");
- funmap_add(d_rename, "dired-rename-file");
+ funmap_add(d_rename, "dired-do-rename");
funmap_add(d_backpage, "dired-scroll-down");
funmap_add(d_forwpage, "dired-scroll-up");
- funmap_add(d_undel, "dired-unflag");
+ funmap_add(d_undel, "dired-unmark");
maps_add((KEYMAP *)&diredmap, "dired");
dobindkey(fundamental_map, "dired", "^Xd");
}
Index: mg.1
===================================================================
RCS file: /cvs/src/usr.bin/mg/mg.1,v
retrieving revision 1.81
diff -u -p -r1.81 mg.1
--- mg.1 1 Jun 2013 17:33:49 -0000 1.81
+++ mg.1 2 Jun 2013 08:07:53 -0000
@@ -936,9 +936,9 @@ dired-shell-command
.It +
dired-create-directory
.It c
-dired-copy-file
+dired-do-copy
.It d and C-d
-dired-flag-file-deleted
+dired-flag-file-deletion
.It e, f and C-m
dired-find-file
.It n
@@ -948,11 +948,11 @@ dired-find-file-other-window
.It p
dired-previous-line
.It r
-dired-rename-file
+dired-do-rename
.It u
-dired-unflag
+dired-unmark
.It x
-dired-do-deletions
+dired-do-flagged-delete
.It C-v
dired-scroll-down
.It M-v
@@ -961,26 +961,25 @@ dired-scroll-up
.Sh MG DIRED COMMANDS
The following are a list of the commands specific to dired mode:
.Bl -tag -width Ds
-.It dired-backup-unflag
-Remove the deletion flag from the file listed on the current line
-of the dired buffer, then move up one line.
-.It dired-copy-file
-Copy the file listed on the current line of the dired buffer.
.It dired-create-directory
Create a directory.
-.It dired-do-deletions
+.It dired-do-copy
+Copy the file listed on the current line of the dired buffer.
+.It dired-do-flagged-delete
Delete the files that have been flagged for deletion.
+.It dired-do-rename
+Rename the file listed on the current line of the dired buffer.
.It dired-find-file
Open the file on the current line of the dired buffer.
If the cursor is on a directory it will be opened in dired mode.
-.It dired-find-file-other-window
-Open the file on the current line of the dired buffer in a
-different window.
-.It dired-flag-file-deleted
+.It dired-flag-file-deletion
Flag the file listed on the current line for deletion.
This is indicated in the buffer by putting a D at the left margin.
No files are actually deleted until the function dired-do-deletions
is executed.
+.It dired-find-file-other-window
+Open the file on the current line of the dired buffer in a
+different window.
.It dired-next-line
Move the cursor to the next line.
.It dired-other-window
@@ -988,14 +987,15 @@ This function works just like dired, exc
dired buffer in another window.
.It dired-previous-line
Move the cursor to the previous line.
-.It dired-rename-file
-Rename the file listed on the current line of the dired buffer.
.It dired-scroll-down
Scroll down the dired buffer.
.It dired-scroll-up
Scroll up the dired buffer.
-.It dired-unflag
+.It dired-unmark
Remove the deletion flag for the file on the current line.
+.It dired-unmark-backward
+Remove the deletion flag from the file listed on the current line
+of the dired buffer, then move up one line.
.El
.Sh CONFIGURATION FILES
There are two configuration files,
