Mercurial > emacs
changeset 80437:8faef799d3b8
(comment-enter-backward): Be careful to restore point changed during narrowing.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 04 Apr 2008 00:41:47 +0000 |
| parents | 0a96ecdd8f7a |
| children | 1894494e0ee9 |
| files | lisp/ChangeLog lisp/newcomment.el |
| diffstat | 2 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Apr 03 08:38:51 2008 +0000 +++ b/lisp/ChangeLog Fri Apr 04 00:41:47 2008 +0000 @@ -1,3 +1,8 @@ +2008-04-04 Stephen Berman <Stephen.Berman@gmx.net> + + * newcomment.el (comment-enter-backward): Be careful to restore + position changed during narrowing. + 2008-04-03 Nick Roberts <nickrob@snap.net.nz> * progmodes/gdb-ui.el (gdb-mouse-set-clear-breakpoint): @@ -10,8 +15,8 @@ 2008-04-02 Alan Mackenzie <acm@muc.de> - * progmodes/cc-cmds.el (c-defun-name, c-cpp-define-name): New - optimised functions to get the name of the current defun/macro. + * progmodes/cc-cmds.el (c-defun-name, c-cpp-define-name): + New optimised functions to get the name of the current defun/macro. * add-log.el (add-log-current-defun): Move the functionality which gets the current function name for C like modes to cc-cmds.el,
--- a/lisp/newcomment.el Thu Apr 03 08:38:51 2008 +0000 +++ b/lisp/newcomment.el Fri Apr 04 00:41:47 2008 +0000 @@ -487,10 +487,11 @@ ;; comment-end = "" (progn (backward-char) (skip-syntax-backward " ")) (cond - ((save-restriction - (narrow-to-region (line-beginning-position) (point)) - (goto-char (point-min)) - (re-search-forward (concat comment-end-skip "\\'") nil t)) + ((save-excursion + (save-restriction + (narrow-to-region (line-beginning-position) (point)) + (goto-char (point-min)) + (re-search-forward (concat comment-end-skip "\\'") nil t))) (goto-char (match-beginning 0))) ;; comment-end-skip not found. Maybe we're at EOB which implicitly ;; closes the comment.