Merge Org 7.8.03

[gnu-emacs] / lisp / calc / calc-trail.el

diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el
index 966910ab488fe97ce344d025cf456ab4a6fafaa0..eec4cd2af5822d2003702a87b6aeffe61a0fc63f 100644 (file)
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -1,7 +1,6 @@
 ;;; calc-trail.el --- functions for manipulating the Calc "trail"
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
@@ -108,20 +107,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")
@@ -142,8 +149,7 @@
                       (search-forward " ")
                       (let* ((next (save-excursion (forward-line 1) (point)))
                              (str (buffer-substring (point) (1- next)))
-                             (val (save-excursion
-                                    (set-buffer save-buf)
+                             (val (with-current-buffer save-buf
                                     (math-read-plain-expr str))))
                         (if (eq (car-safe val) 'error)
                             (error "Can't yank that line: %s" (nth 2 val))
@@ -174,5 +180,4 @@
 
 (provide 'calc-trail)
 
-;; arch-tag: 59b76655-d882-4aab-a3ee-b83870e530d0
 ;;; calc-trail.el ends here