Mercurial > emacs
diff lisp/calc/calc-yank.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 | f6b4d0ebf147 c80fa806ab33 |
| children | 6d92d69fae33 |
line wrap: on
line diff
--- a/lisp/calc/calc-yank.el Sun Jan 02 09:21:32 2005 +0000 +++ b/lisp/calc/calc-yank.el Sun Jan 16 03:40:12 2005 +0000 @@ -430,6 +430,7 @@ (defvar calc-edit-handler) (defvar calc-restore-trail) (defvar calc-allow-ret) +(defvar calc-edit-top) (defun calc-edit-mode (&optional handler allow-ret title) "Calculator editing mode. Press RET, LFD, or C-c C-c to finish. @@ -464,10 +465,15 @@ (let ((calc-edit-handler nil)) (calc-edit-finish t)) (message "(Cancelled)")) t t) - (insert (or title title "Calc Edit Mode. ") - "Press `C-c C-c'" - (if allow-ret "" " or RET") - " to finish, `C-x k RET' to cancel.\n"))) + (insert (propertize + (concat + (or title title "Calc Edit Mode. ") + "Press `C-c C-c'" + (if allow-ret "" " or RET") + " to finish, `C-x k RET' to cancel.\n\n") + 'font-lock-face 'italic 'read-only t 'rear-nonsticky t 'front-sticky t)) + (make-local-variable 'calc-edit-top) + (setq calc-edit-top (point)))) (put 'calc-edit-mode 'mode-class 'special) (defun calc-show-edit-buffer () @@ -484,8 +490,7 @@ (if win (delete-window win)))) (set-buffer-modified-p nil) - (goto-char (point-min)) - (forward-line 1))) + (goto-char calc-edit-top))) (defun calc-edit-return () (interactive) @@ -519,9 +524,7 @@ (set-buffer original) (not (eq major-mode 'calc-mode)))) (error "Original calculator buffer has been corrupted"))) - (goto-char (point-min)) - (when (looking-at "Calc Edit\\|Editing ") - (forward-line 1)) + (goto-char calc-edit-top) (if (buffer-modified-p) (eval calc-edit-handler)) (if one-window @@ -546,7 +549,7 @@ (defun calc-finish-stack-edit (num) (let ((buf (current-buffer)) - (str (buffer-substring (point) (point-max))) + (str (buffer-substring calc-edit-top (point-max))) (start (point)) pos) (if (and (integerp num) (> num 1))