[Emacs-diffs] Changes to emacs/lisp/mouse-sel.el

[Mike Williams]

Index: emacs/lisp/mouse-sel.el
diff -c emacs/lisp/mouse-sel.el:1.33 emacs/lisp/mouse-sel.el:1.34
*** emacs/lisp/mouse-sel.el:1.33        Sun Jul 14 06:13:27 2002
--- emacs/lisp/mouse-sel.el     Mon Jul 15 07:48:44 2002
***************
*** 240,264 ****
      [M-down-mouse-3] [M-mouse-3])
    "A list of events that mouse-sel binds.")
  
- (defun mouse-sel-save-original-bindings ()
-   "Save the current bindings for `mouse-sel-bound-events'."
-   (setq mouse-sel-original-bindings nil)
-   (mapc (function 
-          (lambda (event)
-            (setq mouse-sel-original-bindings
-                  (cons (cons event (lookup-key global-map event))
-                        mouse-sel-original-bindings))))
-         mouse-sel-bound-events))
- 
- (defun mouse-sel-restore-original-bindings ()
-   "Restore the original bindings for `mouse-sel-bound-events'."
-   (mapc (function 
-          (lambda (binding)
-            (if (cdr binding)
-                (global-set-key (car binding) (cdr binding))
-              (global-unset-key (car binding)))))
-         mouse-sel-original-bindings))
- 
  (defun mouse-sel-bindings (bind)
    (cond 
  
--- 240,245 ----
***************
*** 266,273 ****
     ((and bind mouse-sel-default-bindings) 
  
      ;; Save original bindings
!     (mouse-sel-save-original-bindings)
! 
      ;; Primary selection bindings.
      ;;
      ;; Bind keys to `ignore' instead of unsetting them because
--- 247,264 ----
     ((and bind mouse-sel-default-bindings) 
  
      ;; Save original bindings
!     (setq mouse-sel-original-bindings nil)
!     (mapc (function 
!            (lambda (event)
!              (setq mouse-sel-original-bindings
!                    (cons (cons event (lookup-key global-map event))
!                          mouse-sel-original-bindings))))
!           mouse-sel-bound-events)
!     (setq mouse-sel-original-interprogram-cut-function 
!           interprogram-cut-function
!           mouse-sel-original-interprogram-paste-function
!           interprogram-paste-function)
!     
      ;; Primary selection bindings.
      ;;
      ;; Bind keys to `ignore' instead of unsetting them because
***************
*** 295,302 ****
     
     ((not bind)
      ;; Restore original bindings
!     (mouse-sel-restore-original-bindings))
! 
     ))
  
  ;;=== Command Variable ====================================================
--- 286,302 ----
     
     ((not bind)
      ;; Restore original bindings
!     (mapc (function 
!            (lambda (binding)
!              (if (cdr binding)
!                  (global-set-key (car binding) (cdr binding))
!                (global-unset-key (car binding)))))
!           mouse-sel-original-bindings)
!     (setq interprogram-cut-function 
!           mouse-sel-original-interprogram-cut-function
!           interprogram-paste-function
!           mouse-sel-original-interprogram-paste-function))
!    
     ))
  
  ;;=== Command Variable ====================================================