emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/lisp/winner.el [lexbind]
Date: Wed, 08 Dec 2004 19:35:39 -0500

Index: emacs/lisp/winner.el
diff -c emacs/lisp/winner.el:1.22.4.3 emacs/lisp/winner.el:1.22.4.4
*** emacs/lisp/winner.el:1.22.4.3       Tue May 11 02:20:17 2004
--- emacs/lisp/winner.el        Wed Dec  8 23:31:41 2004
***************
*** 44,72 ****
  (eval-when-compile
    (require 'cl))
  
! (eval-when-compile
!   (cond
!    ((eq (aref (emacs-version) 0) ?X)
!     (defmacro winner-active-region ()
!       '(region-active-p))
!     (defsetf winner-active-region () (store)
        `(if ,store (zmacs-activate-region)
!        (zmacs-deactivate-region))))
!    (t (defmacro winner-active-region ()
!       'mark-active)
!       (defsetf winner-active-region () (store)
!       `(setq mark-active ,store)))) )
  
! (eval-and-compile
!   (cond
!    ((eq (aref (emacs-version) 0) ?X)
!     (defalias 'winner-edges 'window-pixel-edges)
!     (defsubst winner-window-list ()
!       (remq (minibuffer-window)
!             (window-list nil 0))))
!    (t (defalias 'winner-edges 'window-edges)
!       (defsubst winner-window-list ()
!         (window-list nil 0)))) )
  
  (require 'ring)
  
--- 44,67 ----
  (eval-when-compile
    (require 'cl))
  
! 
! (defmacro winner-active-region ()
!   (if (fboundp 'region-active-p)
!       '(region-active-p)
!     'mark-active))
! 
! (defsetf winner-active-region () (store)
!   (if (fboundp 'zmacs-activate-region)
        `(if ,store (zmacs-activate-region)
!        (zmacs-deactivate-region))
!     `(setq mark-active ,store)))
  
! (defalias 'winner-edges
!   (if (featurep 'xemacs) 'window-pixel-edges 'window-edges))
! (defalias 'winner-window-list
!   (if (featurep 'xemacs)
!       (lambda () (delq (minibuffer-window) (window-list nil 0)))
!     (lambda () (window-list nil 0))))
  
  (require 'ring)
  
***************
*** 86,93 ****
    "Toggle winner-mode.
  Setting this variable directly does not take effect;
  use either \\[customize] or the function `winner-mode'."
!   :set #'(lambda (symbol value)
!          (winner-mode (or value 0)))
    :initialize 'custom-initialize-default
    :type    'boolean
    :group   'winner
--- 81,87 ----
    "Toggle winner-mode.
  Setting this variable directly does not take effect;
  use either \\[customize] or the function `winner-mode'."
!   :set #'(lambda (symbol value) (funcall symbol (or value 0)))
    :initialize 'custom-initialize-default
    :type    'boolean
    :group   'winner
***************
*** 363,369 ****
    :type 'hook
    :group 'winner)
  
! (defvar winner-mode-map nil "Keymap for Winner mode.")
  
  ;; Check if `window-configuration-change-hook' is working.
  (defun winner-hook-installed-p ()
--- 357,368 ----
    :type 'hook
    :group 'winner)
  
! (defvar winner-mode-map
!   (let ((map (make-sparse-keymap)))
!     (define-key map [(control c) left] 'winner-undo)
!     (define-key map [(control c) right] 'winner-redo)
!     map)
!   "Keymap for Winner mode.")
  
  ;; Check if `window-configuration-change-hook' is working.
  (defun winner-hook-installed-p ()
***************
*** 389,395 ****
        (cond
         ((winner-hook-installed-p)
        (add-hook 'window-configuration-change-hook 'winner-change-fun)
!       (add-hook 'post-command-hook 'winner-save-old-configurations))
         (t (add-hook 'post-command-hook 'winner-save-conditionally)))
        (add-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
        (setq winner-modified-list (frame-list))
--- 388,394 ----
        (cond
         ((winner-hook-installed-p)
        (add-hook 'window-configuration-change-hook 'winner-change-fun)
!       (add-hook 'post-command-hook 'winner-save-old-configurations))
         (t (add-hook 'post-command-hook 'winner-save-conditionally)))
        (add-hook 'minibuffer-setup-hook 'winner-save-unconditionally)
        (setq winner-modified-list (frame-list))
***************
*** 472,488 ****
  
  ;;; To be evaluated when the package is loaded:
  
- (unless winner-mode-map
-   (setq winner-mode-map (make-sparse-keymap))
-   (define-key winner-mode-map [(control c) left] 'winner-undo)
-   (define-key winner-mode-map [(control c) right] 'winner-redo))
- 
  (unless (or (assq 'winner-mode minor-mode-map-alist)
            winner-dont-bind-my-keys)
    (push (cons 'winner-mode winner-mode-map)
        minor-mode-map-alist))
  
  (provide 'winner)
! 
! ;;; arch-tag: 686d1c1b-010e-42ca-a192-b5685112418f
  ;;; winner.el ends here
--- 471,481 ----
  
  ;;; To be evaluated when the package is loaded:
  
  (unless (or (assq 'winner-mode minor-mode-map-alist)
            winner-dont-bind-my-keys)
    (push (cons 'winner-mode winner-mode-map)
        minor-mode-map-alist))
  
  (provide 'winner)
! ;; arch-tag: 686d1c1b-010e-42ca-a192-b5685112418f
  ;;; winner.el ends here




reply via email to

[Prev in Thread] Current Thread [Next in Thread]