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

[Juanma Barranquero]

Index: emacs/lisp/emulation/pc-select.el
diff -c emacs/lisp/emulation/pc-select.el:1.23 
emacs/lisp/emulation/pc-select.el:1.24
*** emacs/lisp/emulation/pc-select.el:1.23      Sun Mar 17 23:31:36 2002
--- emacs/lisp/emulation/pc-select.el   Tue Feb  4 07:56:02 2003
***************
*** 185,191 ****
           ([C-up]      . backward-paragraph-nomark) ; KPrevPara     cUp
           ([S-C-down]  . forward-paragraph-mark)
           ([S-C-up]    . backward-paragraph-mark))))
!     
      (setq pc-select-default-key-bindings lst)))
  
  (defvar pc-select-extra-key-bindings nil
--- 185,191 ----
           ([C-up]      . backward-paragraph-nomark) ; KPrevPara     cUp
           ([S-C-down]  . forward-paragraph-mark)
           ([S-C-up]    . backward-paragraph-mark))))
! 
      (setq pc-select-default-key-bindings lst)))
  
  (defvar pc-select-extra-key-bindings nil
***************
*** 219,225 ****
           ([C-M-delete]  . kill-sexp)
           ;; Next line proposed by Eli Barzilay
           ([C-escape]    . electric-buffer-list))))
!     
      (setq pc-select-extra-key-bindings lst)))
  
  (defvar pc-select-meta-moves-sexps-key-bindings
--- 219,225 ----
           ([C-M-delete]  . kill-sexp)
           ;; Next line proposed by Eli Barzilay
           ([C-escape]    . electric-buffer-list))))
! 
      (setq pc-select-extra-key-bindings lst)))
  
  (defvar pc-select-meta-moves-sexps-key-bindings
***************
*** 773,779 ****
  (defmacro pc-select-add-to-alist (alist var val)
    "Ensure that ALIST contains the cons cell (VAR . VAL).
  If a cons cell whose car is VAR is already on the ALIST, update the
! cdr of that cell with VAL.  Otherwise, make a new cons cell 
  \(VAR . VAL), and prepend it onto ALIST."
    (let ((elt (make-symbol "elt")))
      `(let ((,elt (assq ',var ,alist)))
--- 773,779 ----
  (defmacro pc-select-add-to-alist (alist var val)
    "Ensure that ALIST contains the cons cell (VAR . VAL).
  If a cons cell whose car is VAR is already on the ALIST, update the
! cdr of that cell with VAL.  Otherwise, make a new cons cell
  \(VAR . VAL), and prepend it onto ALIST."
    (let ((elt (make-symbol "elt")))
      `(let ((,elt (assq ',var ,alist)))
***************
*** 803,809 ****
       (,mode ,arg)))
  
  (defmacro pc-select-restore-var (var)
!   "Restore the previous value of the variable VAR. 
  Look up VAR's previous value in `pc-select-saved-settings-alist', and,
  if the value is found, set VAR to that value."
    (let ((elt (make-symbol "elt")))
--- 803,809 ----
       (,mode ,arg)))
  
  (defmacro pc-select-restore-var (var)
!   "Restore the previous value of the variable VAR.
  Look up VAR's previous value in `pc-select-saved-settings-alist', and,
  if the value is found, set VAR to that value."
    (let ((elt (make-symbol "elt")))
***************
*** 919,925 ****
            ;; (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)
            (pc-select-save-and-set-var mark-even-if-inactive t)
--- 919,925 ----
            ;; (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)
            (pc-select-save-and-set-var mark-even-if-inactive t)
***************
*** 966,972 ****
             pc-select-old-M-delete-binding))
        (setq pc-select-key-bindings-alist nil
            pc-select-saved-settings-alist nil))))
!   
  
  ;;;###autoload
  (defcustom pc-selection-mode nil
--- 966,972 ----
             pc-select-old-M-delete-binding))
        (setq pc-select-key-bindings-alist nil
            pc-select-saved-settings-alist nil))))
! 
  
  ;;;###autoload
  (defcustom pc-selection-mode nil