summaryrefslogtreecommitdiff
path: root/lisp/register.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/register.el')
-rw-r--r--lisp/register.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/register.el b/lisp/register.el
index a60181e43c6..053657bd8cb 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -252,7 +252,7 @@ Interactively, reads the register using `register-read-with-preview'."
(goto-char (cadr val)))
((markerp val)
(or (marker-buffer val)
- (error "That register's buffer no longer exists"))
+ (user-error "That register's buffer no longer exists"))
(switch-to-buffer (marker-buffer val))
(goto-char val))
((and (consp val) (eq (car val) 'file))
@@ -260,11 +260,11 @@ Interactively, reads the register using `register-read-with-preview'."
((and (consp val) (eq (car val) 'file-query))
(or (find-buffer-visiting (nth 1 val))
(y-or-n-p (format "Visit file %s again? " (nth 1 val)))
- (error "Register access aborted"))
+ (user-error "Register access aborted"))
(find-file (nth 1 val))
(goto-char (nth 2 val)))
(t
- (error "Register doesn't contain a buffer position or configuration")))))
+ (user-error "Register doesn't contain a buffer position or configuration")))))
(defun register-swap-out ()
"Turn markers into file-query references when a buffer is killed."
@@ -316,7 +316,7 @@ Interactively, reads the register using `register-read-with-preview'."
(set-register register (+ number register-val))))
((or (not register-val) (stringp register-val))
(append-to-register register (region-beginning) (region-end) prefix))
- (t (error "Register does not contain a number or text")))))
+ (t (user-error "Register does not contain a number or text")))))
(defun view-register (register)
"Display what is contained in register named REGISTER.
@@ -449,7 +449,7 @@ Interactively, reads the register using `register-read-with-preview'."
((and (markerp val) (marker-position val))
(princ (marker-position val) (current-buffer)))
(t
- (error "Register does not contain text"))))
+ (user-error "Register does not contain text"))))
(if (not arg) (exchange-point-and-mark)))
(defun copy-to-register (register start end &optional delete-flag region)
@@ -492,7 +492,7 @@ Interactively, reads the register using `register-read-with-preview'."
(set-register
register (cond ((not reg) text)
((stringp reg) (concat reg separator text))
- (t (error "Register does not contain text")))))
+ (t (user-error "Register does not contain text")))))
(setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))
@@ -516,7 +516,7 @@ Interactively, reads the register using `register-read-with-preview'."
(set-register
register (cond ((not reg) text)
((stringp reg) (concat text separator reg))
- (t (error "Register does not contain text")))))
+ (t (user-error "Register does not contain text")))))
(setq deactivate-mark t)
(cond (delete-flag
(delete-region start end))