summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/eshell/em-unix.el4
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0a502543ef3..c17ea64a860 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-28 Aidan Gauland <aidalgol@amuri.net>
+
+ * eshell/em-unix.el: Added -r option to cp
+
2013-05-28 Glenn Morris <rgm@gnu.org>
* vc/vc-arch.el (vc-exec-after): Declare.
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 60caf38710a..af54d875cb0 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -532,8 +532,10 @@ Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY.
"don't change anything on disk")
(?p "preserve" nil preserve
"preserve file attributes if possible")
- (?R "recursive" nil em-recursive
+ (?r "recursive" nil em-recursive
"copy directories recursively")
+ (?R nil nil em-recursive
+ "as for -r")
(?v "verbose" nil em-verbose
"explain what is being done")
(nil "help" nil nil "show this usage screen")