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

[Juanma Barranquero]

Index: emacs/lisp/windmove.el
diff -c emacs/lisp/windmove.el:1.4 emacs/lisp/windmove.el:1.5
*** emacs/lisp/windmove.el:1.4  Fri Oct  5 05:28:08 2001
--- emacs/lisp/windmove.el      Tue May  7 12:37:01 2002
***************
*** 98,104 ****
  ;;
  ;; Put the following line in your `.emacs' file:
  ;;
! ;;     (windmove-default-keybindings)    ; default keybindings
  ;;
  ;;
  ;; If you wish to enable wrap-around, also add a line like:
--- 98,110 ----
  ;;
  ;; Put the following line in your `.emacs' file:
  ;;
! ;;     (windmove-default-keybindings)         ; shifted arrow keys
! ;;
! ;; or
! ;;
! ;;     (windmove-default-keybindings 'hyper)  ; etc.
! ;;
! ;; to use another modifier key.
  ;;
  ;;
  ;; If you wish to enable wrap-around, also add a line like:
***************
*** 110,116 ****
  ;; causes the occasional creation of a "lost column" between windows,
  ;; so that two adjacent windows do not actually touch, you may want to
  ;; increase the value of `windmove-window-distance-delta' to 2 or 3:
! ;;     
  ;;     (setq windmove-window-distance-delta 2)
  ;;
  
--- 116,122 ----
  ;; causes the occasional creation of a "lost column" between windows,
  ;; so that two adjacent windows do not actually touch, you may want to
  ;; increase the value of `windmove-window-distance-delta' to 2 or 3:
! ;;
  ;;     (setq windmove-window-distance-delta 2)
  ;;
  
***************
*** 589,601 ****
  ;; probably want to use different bindings in that case.
  
  ;;;###autoload
! (defun windmove-default-keybindings ()
!   "Set up default keybindings for `windmove'."
    (interactive)
!   (global-set-key [(shift left)]  'windmove-left)
!   (global-set-key [(shift up)]    'windmove-up)
!   (global-set-key [(shift right)] 'windmove-right)
!   (global-set-key [(shift down)]  'windmove-down))
  
  
  (provide 'windmove)
--- 595,610 ----
  ;; probably want to use different bindings in that case.
  
  ;;;###autoload
! (defun windmove-default-keybindings (&optional modifier)
!   "Set up keybindings for `windmove'.
! Keybindings are of the form MODIFIER-{left,right,up,down}.
! Default MODIFIER is 'shift."
    (interactive)
!   (unless modifier (setq modifier 'shift))
!   (global-set-key (vector (list modifier 'left))  'windmove-left)
!   (global-set-key (vector (list modifier 'right)) 'windmove-right)
!   (global-set-key (vector (list modifier 'up))    'windmove-up)
!   (global-set-key (vector (list modifier 'down))  'windmove-down))
  
  
  (provide 'windmove)