mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Push mark before goto-char in jump-to-register and check-parens

Browse source 
* register.el (jump-to-register):
* emacs-lisp/lisp.el (check-parens):
Push mark before goto-char so user doesn't lose his previous place.
This commit is contained in:
Kelly Dean 2015-02-18 07:41:10 +00:00 • committed by Artur Malabarba
parent 56f5ea17f1
commit b1d6ddd446
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2015-02-18 Kelly Dean <kelly@prtime.org>
* 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 <kelly@prtime.org> 2015-02-18 Kelly Dean <kelly@prtime.org>
* rect.el (rectangle-mark-mode): * rect.el (rectangle-mark-mode):

3
lisp/emacs-lisp/lisp.el
View file

@ -714,7 +714,8 @@ character."
(condition-case data (condition-case data
;; Buffer can't have more than (point-max) sexps. ;; Buffer can't have more than (point-max) sexps.
(scan-sexps (point-min) (point-max)) (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 ;; Could print (nth 1 data), which is either
;; "Containing expression ends prematurely" or ;; "Containing expression ends prematurely" or
;; "Unbalanced parentheses", but those may not be so ;; "Unbalanced parentheses", but those may not be so

3
lisp/register.el
View file

@ -254,6 +254,9 @@ Interactively, reads the register using `register-read-with-preview'."
(or (marker-buffer val) (or (marker-buffer val)
(user-error "That register's buffer no longer exists")) (user-error "That register's buffer no longer exists"))
(switch-to-buffer (marker-buffer val)) (switch-to-buffer (marker-buffer val))
(unless (or (= (point) (marker-position val))
(eq last-command 'jump-to-register))
(push-mark))
(goto-char val)) (goto-char val))
((and (consp val) (eq (car val) 'file)) ((and (consp val) (eq (car val) 'file))
(find-file (cdr val))) (find-file (cdr val)))