[Emacs-diffs] Changes to emacs/lisp/emulation/pc-select.el

[Richard M. Stallman]

Index: emacs/lisp/emulation/pc-select.el
diff -c emacs/lisp/emulation/pc-select.el:1.22 
emacs/lisp/emulation/pc-select.el:1.23
*** emacs/lisp/emulation/pc-select.el:1.22      Thu Jan 31 22:59:17 2002
--- emacs/lisp/emulation/pc-select.el   Sun Mar 17 23:31:36 2002
***************
*** 882,890 ****
    (if pc-selection-mode
        (if (null pc-select-key-bindings-alist)
          (progn
!           (setq pc-select-map (copy-keymap (current-global-map))
!                 pc-select-saved-global-map (copy-keymap (current-global-map)))
!             
            (setq pc-select-key-bindings-alist
                  (append pc-select-default-key-bindings
                          (if pc-select-selection-keys-only
--- 882,888 ----
    (if pc-selection-mode
        (if (null pc-select-key-bindings-alist)
          (progn
!           (setq pc-select-saved-global-map (copy-keymap (current-global-map)))
            (setq pc-select-key-bindings-alist
                  (append pc-select-default-key-bindings
                          (if pc-select-selection-keys-only
***************
*** 899,912 ****
                              nil
                            pc-select-tty-key-bindings)))
  
!           (pc-select-define-keys pc-select-key-bindings-alist pc-select-map)
!           (use-global-map pc-select-map)
  
            (unless  (or pc-select-selection-keys-only
                         (eq window-system 'x)
                         (memq system-name '(ms-dos windows-nt)))
              ;; it is not clear that we need the following line
!        ;; I hope it doesn't do too much harm to leave it in, though...
              (setq pc-select-old-M-delete-binding
                    (lookup-key function-key-map [M-delete]))
              (define-key function-key-map  [M-delete] [?\M-d]))
--- 897,910 ----
                              nil
                            pc-select-tty-key-bindings)))
  
!           (pc-select-define-keys pc-select-key-bindings-alist
!                                  (current-global-map))
  
            (unless  (or pc-select-selection-keys-only
                         (eq window-system 'x)
                         (memq system-name '(ms-dos windows-nt)))
              ;; it is not clear that we need the following line
!             ;; I hope it doesn't do too much harm to leave it in, though...
              (setq pc-select-old-M-delete-binding
                    (lookup-key function-key-map [M-delete]))
              (define-key function-key-map  [M-delete] [?\M-d]))
***************
*** 920,926 ****
            ;; the original author also had this above:
            ;; (setq-default normal-erase-is-backspace t)
            ;; However, the documentation for the variable says that
!         ;; "setting it with setq has no effect", so I'm removing it.
        
            (pc-select-save-and-set-var highlight-nonselected-windows nil)
            (pc-select-save-and-set-var transient-mark-mode t)
--- 918,924 ----
            ;; the original author also had this above:
            ;; (setq-default normal-erase-is-backspace t)
            ;; However, the documentation for the variable says that
!           ;; "setting it with setq has no effect", so I'm removing it.
        
            (pc-select-save-and-set-var highlight-nonselected-windows nil)
            (pc-select-save-and-set-var transient-mark-mode t)
***************
*** 931,944 ****
        ;; do not clobber the values of the variables that were
        ;; saved from before pc-selection mode was activated --
        ;; just make sure the values are the way we like them.
!       (setq pc-select-map (copy-keymap (current-global-map)))
!       (pc-select-define-keys pc-select-key-bindings-alist pc-select-map)
!       (use-global-map pc-select-map)
        (unless  (or pc-select-selection-keys-only
                     (eq window-system 'x)
                     (memq system-name '(ms-dos windows-nt)))
          ;; it is not clear that we need the following line
!        ;; I hope it doesn't do too much harm to leave it in, though...
          (define-key function-key-map  [M-delete] [?\M-d]))
        (when (and (not pc-select-selection-keys-only)
                   (or (eq window-system 'x)
--- 929,941 ----
        ;; do not clobber the values of the variables that were
        ;; saved from before pc-selection mode was activated --
        ;; just make sure the values are the way we like them.
!       (pc-select-define-keys pc-select-key-bindings-alist
!                              (current-global-map))
        (unless  (or pc-select-selection-keys-only
                     (eq window-system 'x)
                     (memq system-name '(ms-dos windows-nt)))
          ;; it is not clear that we need the following line
!         ;; I hope it doesn't do too much harm to leave it in, though...
          (define-key function-key-map  [M-delete] [?\M-d]))
        (when (and (not pc-select-selection-keys-only)
                   (or (eq window-system 'x)
***************
*** 956,965 ****
                     (memq system-name '(ms-dos windows-nt))))
        (pc-select-restore-mode normal-erase-is-backspace-mode))
  
-       (setq pc-select-map (copy-keymap (current-global-map)))
        (pc-select-restore-keys
!        pc-select-key-bindings-alist pc-select-map pc-select-saved-global-map)
!       (use-global-map pc-select-map)
  
        (pc-select-restore-var highlight-nonselected-windows)
        (pc-select-restore-var transient-mark-mode)
--- 953,961 ----
                     (memq system-name '(ms-dos windows-nt))))
        (pc-select-restore-mode normal-erase-is-backspace-mode))
  
        (pc-select-restore-keys
!        pc-select-key-bindings-alist (current-global-map)
!        pc-select-saved-global-map)
  
        (pc-select-restore-var highlight-nonselected-windows)
        (pc-select-restore-var transient-mark-mode)