[Emacs-diffs] Changes to emacs/lisp/calc/calcsel2.el

[Jay Belanger]

Index: emacs/lisp/calc/calcsel2.el
diff -c emacs/lisp/calc/calcsel2.el:1.8 emacs/lisp/calc/calcsel2.el:1.9
*** emacs/lisp/calc/calcsel2.el:1.8     Tue Nov 30 17:32:17 2004
--- emacs/lisp/calc/calcsel2.el Sat May  7 21:23:19 2005
***************
*** 34,39 ****
--- 34,43 ----
  ;; 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")
    (if (< arg 0)
***************
*** 41,47 ****
      (calc-wrapper
       (calc-preserve-point)
       (let ((num (max 1 (calc-locate-cursor-element (point))))
!          (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))
--- 45,51 ----
      (calc-wrapper
       (calc-preserve-point)
       (let ((num (max 1 (calc-locate-cursor-element (point))))
!          (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))
***************
*** 106,119 ****
           (if (null new)
               (if arg
                   (error "Term is already leftmost")
!                (or 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)
                         sel))))))))))
  
  (defun calc-commute-right (arg)
--- 110,123 ----
           (if (null new)
               (if arg
                   (error "Term is already leftmost")
!                (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)) calc-sel-reselect)
                         sel))))))))))
  
  (defun calc-commute-right (arg)
***************
*** 123,129 ****
      (calc-wrapper
       (calc-preserve-point)
       (let ((num (max 1 (calc-locate-cursor-element (point))))
!          (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))
--- 127,133 ----
      (calc-wrapper
       (calc-preserve-point)
       (let ((num (max 1 (calc-locate-cursor-element (point))))
!          (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))
***************
*** 189,202 ****
           (if (null new)
               (if arg
                   (error "Term is already rightmost")
!                (or 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)
                         sel))))))))))
  
  (defun calc-build-assoc-term (op lhs rhs)
--- 193,206 ----
           (if (null new)
               (if arg
                   (error "Term is already rightmost")
!                (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)) calc-sel-reselect)
                         sel))))))))))
  
  (defun calc-build-assoc-term (op lhs rhs)
***************
*** 225,231 ****
    (calc-wrapper
     (calc-preserve-point)
     (let* ((num (max 1 (calc-locate-cursor-element (point))))
!         (reselect calc-keep-selection)
          (entry (calc-top num 'entry))
          (expr (car entry))
          (sel (or (calc-auto-selection entry) expr)))
--- 229,235 ----
    (calc-wrapper
     (calc-preserve-point)
     (let* ((num (max 1 (calc-locate-cursor-element (point))))
!         (calc-sel-reselect calc-keep-selection)
          (entry (calc-top num 'entry))
          (expr (car entry))
          (sel (or (calc-auto-selection entry) expr)))
***************
*** 236,249 ****
                                (list (calc-replace-sub-formula
                                       expr sel (nth 1 sel)))
                                num
!                               (list (and 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)
          (entry (calc-top num 'entry))
          (expr (car entry))
          (sel (or (calc-auto-selection entry) (error "No selection")))
--- 240,253 ----
                                (list (calc-replace-sub-formula
                                       expr sel (nth 1 sel)))
                                num
!                               (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))))
!         (calc-sel-reselect calc-keep-selection)
          (entry (calc-top num 'entry))
          (expr (car entry))
          (sel (or (calc-auto-selection entry) (error "No selection")))
***************
*** 266,272 ****
                                (list (calc-replace-sub-formula
                                       expr eqn soln))
                                num
!                               (list (and reselect sel)))
       (calc-handle-whys))))
  
  (defun calc-sel-commute (many)
--- 270,276 ----
                                (list (calc-replace-sub-formula
                                       expr eqn soln))
                                num
!                               (list (and calc-sel-reselect sel)))
       (calc-handle-whys))))
  
  (defun calc-sel-commute (many)