diff lisp/calc/calcsel2.el @ 88155:d7ddb3e565de

sync with trunk

--- a/lisp/calc/calcsel2.el	Sun Jan 15 23:02:10 2006 +0000
+++ b/lisp/calc/calcsel2.el	Mon Jan 16 00:03:54 2006 +0000
@@ -1,10 +1,10 @@
 ;;; calcsel2.el --- selection functions for Calc
 
-;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <[e-mail]>
-;; Maintainers: D. Goel <[e-mail]>
-;;              Colin Walters <[e-mail]>
+;; Maintainer: Jay Belanger <[e-mail]>
 
 ;; This file is part of GNU Emacs.
 
@@ -28,12 +28,16 @@
 ;;; Code:
 
 ;; This file is autoloaded from calc-ext.el.
+
 (require 'calc-ext)
-
 (require 'calc-macs)
 
-(defun calc-Need-calc-sel-2 () nil)
+;; The variable calc-keep-selection is declared and set in calc-sel.el.
+(defvar calc-keep-selection)
 
+;; The variable calc-sel-reselect is local to the methods below,
+;; but is used by some functions in calc-sel.el which are called
+;; by the functions below.
 
 (defun calc-commute-left (arg)
   (interactive "p")
@@ -42,7 +46,7 @@
     (calc-wrapper
      (calc-preserve-point)
      (let ((num (max 1 (calc-locate-cursor-element (point))))
-	   (reselect calc-keep-selection))
+	   (calc-sel-reselect calc-keep-selection))
        (if (= arg 0) (setq arg nil))
        (while (or (null arg) (>= (setq arg (1- arg)) 0))
 	 (let* ((entry (calc-top num 'entry))
@@ -107,14 +111,14 @@
 	   (if (null new)
 	       (if arg
 		   (error "Term is already leftmost")
-		 (or reselect
+		 (or calc-sel-reselect
 		     (calc-pop-push-list 1 (list expr) num '(nil)))
 		 (setq arg 0))
 	     (calc-pop-push-record-list
 	      1 "left"
 	      (list (calc-replace-sub-formula expr parent new))
 	      num
-	      (list (and (or (not (eq arg 0)) reselect)
+	      (list (and (or (not (eq arg 0)) calc-sel-reselect)
 			 sel))))))))))
 
 (defun calc-commute-right (arg)
@@ -124,7 +128,7 @@
     (calc-wrapper
      (calc-preserve-point)
      (let ((num (max 1 (calc-locate-cursor-element (point))))
-	   (reselect calc-keep-selection))
+	   (calc-sel-reselect calc-keep-selection))
        (if (= arg 0) (setq arg nil))
        (while (or (null arg) (>= (setq arg (1- arg)) 0))
 	 (let* ((entry (calc-top num 'entry))
@@ -190,14 +194,14 @@
 	   (if (null new)
 	       (if arg
 		   (error "Term is already rightmost")
-		 (or reselect
+		 (or calc-sel-reselect
 		     (calc-pop-push-list 1 (list expr) num '(nil)))
 		 (setq arg 0))
 	     (calc-pop-push-record-list
 	      1 "rght"
 	      (list (calc-replace-sub-formula expr parent new))
 	      num
-	      (list (and (or (not (eq arg 0)) reselect)
+	      (list (and (or (not (eq arg 0)) calc-sel-reselect)
 			 sel))))))))))
 
 (defun calc-build-assoc-term (op lhs rhs)
@@ -226,7 +230,7 @@
   (calc-wrapper
    (calc-preserve-point)
    (let* ((num (max 1 (calc-locate-cursor-element (point))))
-	  (reselect calc-keep-selection)
+	  (calc-sel-reselect calc-keep-selection)
 	  (entry (calc-top num 'entry))
 	  (expr (car entry))
 	  (sel (or (calc-auto-selection entry) expr)))
@@ -237,14 +241,14 @@
 				(list (calc-replace-sub-formula
 				       expr sel (nth 1 sel)))
 				num
-				(list (and reselect (nth 1 sel)))))))
+				(list (and calc-sel-reselect (nth 1 sel)))))))
 
 (defun calc-sel-isolate ()
   (interactive)
   (calc-slow-wrapper
    (calc-preserve-point)
    (let* ((num (max 1 (calc-locate-cursor-element (point))))
-	  (reselect calc-keep-selection)
+	  (calc-sel-reselect calc-keep-selection)
 	  (entry (calc-top num 'entry))
 	  (expr (car entry))
 	  (sel (or (calc-auto-selection entry) (error "No selection")))
@@ -267,7 +271,7 @@
 				(list (calc-replace-sub-formula
 				       expr eqn soln))
 				num
-				(list (and reselect sel)))
+				(list (and calc-sel-reselect sel)))
      (calc-handle-whys))))
 
 (defun calc-sel-commute (many)
@@ -296,4 +300,7 @@
   (interactive "P")
   (calc-rewrite-selection "InvertRules" many "jinv"))
 
+(provide 'calcsel2)
+
+;;; arch-tag: 7c5b8d65-b8f0-45d9-820d-9930f8ee114b
 ;;; calcsel2.el ends here