comparison lisp/calc/calc-sel.el @ 90072:cb67264d6096

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-2 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-83 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-84 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-3 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-4 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-5 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-6 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-11 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-12 Remove "-face" suffix from lazy-highlight face name * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-13 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-16 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-17 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-18 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-21 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-22 <no summary provided> * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-23 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-39 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-40 Fix regressions from latest reftex update * miles@gnu.org--gnu-2005/gnus--rel--5.10--base-0 tag of miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-82 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-1 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-2 Merge from miles@gnu.org--gnu-2004 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-3 Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Sun, 16 Jan 2005 03:40:12 +0000
parents f2ebccfa87d4 bef2fe94c4a5
children 4da4a09e8b1b
comparison
equal deleted inserted replaced
90071:f6b4d0ebf147 90072:cb67264d6096
675 (defvar calc-original-buffer) 675 (defvar calc-original-buffer)
676 676
677 ;; The variable calc-edit-disp-trail is local to calc-edit-finish, 677 ;; The variable calc-edit-disp-trail is local to calc-edit-finish,
678 ;; in calc-yank.el. 678 ;; in calc-yank.el.
679 (defvar calc-edit-disp-trail) 679 (defvar calc-edit-disp-trail)
680 (defvar calc-edit-top)
680 681
681 (defun calc-finish-selection-edit (num sel reselect) 682 (defun calc-finish-selection-edit (num sel reselect)
682 (let ((buf (current-buffer)) 683 (let ((buf (current-buffer))
683 (str (buffer-substring (point) (point-max))) 684 (str (buffer-substring calc-edit-top (point-max)))
684 (start (point))) 685 (start (point)))
685 (switch-to-buffer calc-original-buffer) 686 (switch-to-buffer calc-original-buffer)
686 (let ((val (math-read-expr str))) 687 (let ((val (math-read-expr str)))
687 (if (eq (car-safe val) 'error) 688 (if (eq (car-safe val) 'error)
688 (progn 689 (progn