aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2005-06-16 14:31:44 +0000
committerJuanma Barranquero2005-06-16 14:31:44 +0000
commit8ac28be569d2f904c913ac2230eaa6f85e0b8d84 (patch)
tree3d48e2d845079658885d73707c0aaae076a214b6 /lisp
parent521677279bd0409b78ed77f35a1ec36ca57d62a6 (diff)
downloademacs-8ac28be569d2f904c913ac2230eaa6f85e0b8d84.tar.gz
emacs-8ac28be569d2f904c913ac2230eaa6f85e0b8d84.zip
(undo-more): Don't use `format' on `error' arguments. Improve
argument/docstring consistency. (pending-undo-list): Doc fix.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/simple.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 0ba6c424a4a..234b30f92bf 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1288,7 +1288,7 @@ A redo record for ordinary undo maps to the following (earlier) undo.")
1288 1288
1289(defvar pending-undo-list nil 1289(defvar pending-undo-list nil
1290 "Within a run of consecutive undo commands, list remaining to be undone. 1290 "Within a run of consecutive undo commands, list remaining to be undone.
1291t if we undid all the way to the end of it.") 1291If t, we undid all the way to the end of it.")
1292 1292
1293(defun undo (&optional arg) 1293(defun undo (&optional arg)
1294 "Undo some previous changes. 1294 "Undo some previous changes.
@@ -1400,16 +1400,16 @@ Contrary to `undo', this will not redo a previous undo."
1400 "Non-nil while performing an undo. 1400 "Non-nil while performing an undo.
1401Some change-hooks test this variable to do something different.") 1401Some change-hooks test this variable to do something different.")
1402 1402
1403(defun undo-more (count) 1403(defun undo-more (n)
1404 "Undo back N undo-boundaries beyond what was already undone recently. 1404 "Undo back N undo-boundaries beyond what was already undone recently.
1405Call `undo-start' to get ready to undo recent changes, 1405Call `undo-start' to get ready to undo recent changes,
1406then call `undo-more' one or more times to undo them." 1406then call `undo-more' one or more times to undo them."
1407 (or (listp pending-undo-list) 1407 (or (listp pending-undo-list)
1408 (error (format "No further undo information%s" 1408 (error (concat "No further undo information"
1409 (if (and transient-mark-mode mark-active) 1409 (and transient-mark-mode mark-active
1410 " for region" "")))) 1410 " for region"))))
1411 (let ((undo-in-progress t)) 1411 (let ((undo-in-progress t))
1412 (setq pending-undo-list (primitive-undo count pending-undo-list)) 1412 (setq pending-undo-list (primitive-undo n pending-undo-list))
1413 (if (null pending-undo-list) 1413 (if (null pending-undo-list)
1414 (setq pending-undo-list t)))) 1414 (setq pending-undo-list t))))
1415 1415