[Emacs-diffs] /srv/bzr/emacs/trunk r100356: calc-trail.el (calc-trail-isearch-forward)

[Jay Belanger]

------------------------------------------------------------
revno: 100356
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Tue 2010-05-18 17:49:56 -0500
message:
  calc-trail.el (calc-trail-isearch-forward)
  (calc-trail-isearch-backward): Ensure that the new window
  point is set correctly.
modified:
  lisp/ChangeLog
  lisp/calc/calc-trail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-18 20:31:44 +0000
+++ b/lisp/ChangeLog    2010-05-18 22:49:56 +0000
@@ -1,3 +1,9 @@
+2010-05-18  Jay Belanger  <address@hidden>
+
+       * calc/calc-trail.el (calc-trail-isearch-forward)
+       (calc-trail-isearch-backward): Ensure that the new window
+       point is set correctly.
+
 2010-05-18  Stefan Monnier  <address@hidden>
 
        * subr.el (read-quoted-char): Resolve modifiers after key

=== modified file 'lisp/calc/calc-trail.el'
--- a/lisp/calc/calc-trail.el   2010-01-13 08:35:10 +0000
+++ b/lisp/calc/calc-trail.el   2010-05-18 22:49:56 +0000
@@ -108,20 +108,28 @@
 (defun calc-trail-isearch-forward ()
   (interactive)
   (calc-with-trail-buffer
-   (save-window-excursion
-     (select-window (get-buffer-window (current-buffer)))
-     (let ((search-exit-char ?\r))
-       (isearch-forward)))
-   (calc-trail-here)))
+   (let ((win (get-buffer-window (current-buffer)))
+         pos)
+     (save-window-excursion
+       (select-window win)
+       (isearch-forward)
+       (setq pos (point)))
+     (goto-char pos)
+     (set-window-point win pos)
+     (calc-trail-here))))
 
 (defun calc-trail-isearch-backward ()
   (interactive)
   (calc-with-trail-buffer
-   (save-window-excursion
-     (select-window (get-buffer-window (current-buffer)))
-     (let ((search-exit-char ?\r))
-       (isearch-backward)))
-   (calc-trail-here)))
+   (let ((win (get-buffer-window (current-buffer)))
+         pos)
+     (save-window-excursion
+       (select-window win)
+       (isearch-backward)
+       (setq pos (point)))
+     (goto-char pos)
+     (set-window-point win pos)
+     (calc-trail-here))))
 
 (defun calc-trail-yank (arg)
   (interactive "P")