From 72f7eded979c672662112304cc8615c0dbcf9803 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Wed, 18 Feb 2015 07:35:49 +0000 Subject: Use user-error where error is inappropriate * help-mode.el (help-go-back, help-go-forward, help-follow): * simple.el (yank-pop, pop-to-mark-command, exchange-point-and-mark): * winner.el (winner-redo): * windmove.el (windmove-do-window-select): * register.el (jump-to-register, increment-register, insert-register) (append-to-register, prepend-to-register): * files.el (find-alternate-file, abort-if-file-too-large, write-file) (set-visited-file-name): * emacs-lisp/lisp.el (kill-backward-up-list): Use user-error instead of error. (Bug#14480) --- lisp/emacs-lisp/lisp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/lisp.el') diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 214bed7622d..fb631a73da1 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -263,7 +263,7 @@ This command assumes point is not in a string or comment." (backward-up-list arg) (kill-sexp) (insert current-sexp)) - (error "Not at a sexp")))) + (user-error "Not at a sexp")))) (defvar beginning-of-defun-function nil "If non-nil, function for `beginning-of-defun-raw' to call. -- cgit v1.2.3 From b1d6ddd44614c84746f5ee494e1f29cd9be8a2d8 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Wed, 18 Feb 2015 07:41:10 +0000 Subject: Push mark before goto-char in jump-to-register and check-parens * register.el (jump-to-register): * emacs-lisp/lisp.el (check-parens): Push mark before goto-char so user doesn't lose his previous place. --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lisp/lisp.el | 3 ++- lisp/register.el | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp/lisp.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a15295f4b4e..b71b55d8477 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-02-18 Kelly Dean + + * register.el (jump-to-register): + * emacs-lisp/lisp.el (check-parens): + Push mark before goto-char so user doesn't lose his previous place. + 2015-02-18 Kelly Dean * rect.el (rectangle-mark-mode): diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index fb631a73da1..67d14872b3a 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -714,7 +714,8 @@ character." (condition-case data ;; Buffer can't have more than (point-max) sexps. (scan-sexps (point-min) (point-max)) - (scan-error (goto-char (nth 2 data)) + (scan-error (push-mark) + (goto-char (nth 2 data)) ;; Could print (nth 1 data), which is either ;; "Containing expression ends prematurely" or ;; "Unbalanced parentheses", but those may not be so diff --git a/lisp/register.el b/lisp/register.el index 053657bd8cb..7afbc06c7fc 100644 --- a/lisp/register.el +++ b/lisp/register.el @@ -254,6 +254,9 @@ Interactively, reads the register using `register-read-with-preview'." (or (marker-buffer val) (user-error "That register's buffer no longer exists")) (switch-to-buffer (marker-buffer val)) + (unless (or (= (point) (marker-position val)) + (eq last-command 'jump-to-register)) + (push-mark)) (goto-char val)) ((and (consp val) (eq (car val) 'file)) (find-file (cdr val))) -- cgit v1.2.3