aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
12013-05-28 Aidan Gauland <aidalgol@amuri.net>
2
3 * eshell/em-unix.el: Added -r option to cp
4
12013-05-28 Glenn Morris <rgm@gnu.org> 52013-05-28 Glenn Morris <rgm@gnu.org>
2 6
3 * vc/vc-arch.el (vc-exec-after): Declare. 7 * 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.
532 "don't change anything on disk") 532 "don't change anything on disk")
533 (?p "preserve" nil preserve 533 (?p "preserve" nil preserve
534 "preserve file attributes if possible") 534 "preserve file attributes if possible")
535 (?R "recursive" nil em-recursive 535 (?r "recursive" nil em-recursive
536 "copy directories recursively") 536 "copy directories recursively")
537 (?R nil nil em-recursive
538 "as for -r")
537 (?v "verbose" nil em-verbose 539 (?v "verbose" nil em-verbose
538 "explain what is being done") 540 "explain what is being done")
539 (nil "help" nil nil "show this usage screen") 541 (nil "help" nil nil "show this usage screen")