[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-yank.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-yank.el [emacs-unicode-2] |
Date: |
Wed, 08 Dec 2004 01:05:01 -0500 |
Index: emacs/lisp/calc/calc-yank.el
diff -c emacs/lisp/calc/calc-yank.el:1.6.4.1
emacs/lisp/calc/calc-yank.el:1.6.4.2
*** emacs/lisp/calc/calc-yank.el:1.6.4.1 Fri Apr 16 12:50:12 2004
--- emacs/lisp/calc/calc-yank.el Wed Dec 8 05:02:18 2004
***************
*** 3,10 ****
;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
;; Author: David Gillespie <address@hidden>
! ;; Maintainers: D. Goel <address@hidden>
! ;; Colin Walters <address@hidden>
;; This file is part of GNU Emacs.
--- 3,9 ----
;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
;; Author: David Gillespie <address@hidden>
! ;; Maintainer: Jay Belanger <address@hidden>
;; This file is part of GNU Emacs.
***************
*** 28,40 ****
;;; Code:
;; This file is autoloaded from calc-ext.el.
- (require 'calc-ext)
(require 'calc-macs)
- (defun calc-Need-calc-yank () nil)
-
-
;;; Kill ring commands.
(defun calc-kill (nn &optional no-delete)
--- 27,36 ----
;;; Code:
;; This file is autoloaded from calc-ext.el.
+ (require 'calc-ext)
(require 'calc-macs)
;;; Kill ring commands.
(defun calc-kill (nn &optional no-delete)
***************
*** 428,433 ****
--- 424,436 ----
(define-key calc-edit-mode-map "\r" 'calc-edit-return)
(define-key calc-edit-mode-map "\C-c\C-c" 'calc-edit-finish))
+ (defvar calc-original-buffer)
+ (defvar calc-return-buffer)
+ (defvar calc-one-window)
+ (defvar calc-edit-handler)
+ (defvar calc-restore-trail)
+ (defvar calc-allow-ret)
+
(defun calc-edit-mode (&optional handler allow-ret title)
"Calculator editing mode. Press RET, LFD, or C-c C-c to finish.
To cancel the edit, simply kill the *Calc Edit* buffer."
***************
*** 492,497 ****
--- 495,504 ----
(newline)
(calc-edit-finish)))
+ ;; The variable calc-edit-disp-trail is local to calc-edit finish, but
+ ;; is used by calc-finish-selection-edit and calc-finish-stack-edit.
+ (defvar calc-edit-disp-trail)
+
(defun calc-edit-finish (&optional keep)
"Finish calc-edit mode. Parse buffer contents and push them on the stack."
(interactive "P")
***************
*** 507,513 ****
(original calc-original-buffer)
(return calc-return-buffer)
(one-window calc-one-window)
! (disp-trail calc-restore-trail))
(save-excursion
(when (or (null (buffer-name original))
(progn
--- 514,520 ----
(original calc-original-buffer)
(return calc-return-buffer)
(one-window calc-one-window)
! (calc-edit-disp-trail calc-restore-trail))
(save-excursion
(when (or (null (buffer-name original))
(progn
***************
*** 527,533 ****
(if keep
(bury-buffer buf)
(kill-buffer buf))
! (if disp-trail
(calc-wrapper
(calc-trail-display 1 t)))
(message "")))
--- 534,540 ----
(if keep
(bury-buffer buf)
(kill-buffer buf))
! (if calc-edit-disp-trail
(calc-wrapper
(calc-trail-display 1 t)))
(message "")))
***************
*** 561,567 ****
(progn
(set num (car vals))
(calc-refresh-evaltos num))
! (if disp-trail
(calc-trail-display 1 t))
(and vals
(let ((calc-simplify-mode (if (eq last-command-char ?\C-j)
--- 568,574 ----
(progn
(set num (car vals))
(calc-refresh-evaltos num))
! (if calc-edit-disp-trail
(calc-trail-display 1 t))
(and vals
(let ((calc-simplify-mode (if (eq last-command-char ?\C-j)
***************
*** 571,575 ****
--- 578,584 ----
(calc-enter-result num "edit" vals)
(calc-enter-result 1 "edit" vals (- num))))))))))
+ (provide 'calc-yank)
+
;;; arch-tag: ca61019e-caca-4daa-b32c-b6afe372d5b5
;;; calc-yank.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-yank.el [emacs-unicode-2],
Miles Bader <=