emacs-diffs
[Top][All Lists]
Advanced

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

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


From: Juri Linkov
Subject: [Emacs-diffs] Changes to emacs/lisp/compare-w.el
Date: Tue, 19 Jul 2005 07:19:14 -0400

Index: emacs/lisp/compare-w.el
diff -c emacs/lisp/compare-w.el:1.28 emacs/lisp/compare-w.el:1.29
*** emacs/lisp/compare-w.el:1.28        Mon Jul  4 23:08:52 2005
--- emacs/lisp/compare-w.el     Tue Jul 19 11:19:13 2005
***************
*** 56,62 ****
  (defcustom compare-ignore-whitespace nil
    "*Non-nil means `compare-windows' ignores whitespace."
    :type 'boolean
!   :group 'compare-w)
  
  (defcustom compare-ignore-case nil
    "*Non-nil means `compare-windows' ignores case differences."
--- 56,63 ----
  (defcustom compare-ignore-whitespace nil
    "*Non-nil means `compare-windows' ignores whitespace."
    :type 'boolean
!   :group 'compare-w
!   :version "22.1")
  
  (defcustom compare-ignore-case nil
    "*Non-nil means `compare-windows' ignores case differences."
***************
*** 88,94 ****
  If the value of this variable is `nil', then function `ding' is
  called to beep or flash the screen when points are mismatched."
    :type '(choice regexp function)
!   :group 'compare-w)
  
  (defcustom compare-windows-sync-string-size 32
    "*Size of string from one window that is searched in second window.
--- 89,96 ----
  If the value of this variable is `nil', then function `ding' is
  called to beep or flash the screen when points are mismatched."
    :type '(choice regexp function)
!   :group 'compare-w
!   :version "22.1")
  
  (defcustom compare-windows-sync-string-size 32
    "*Size of string from one window that is searched in second window.
***************
*** 99,105 ****
  
  The default value 32 is good for the most cases."
    :type 'integer
!   :group 'compare-w)
  
  (defcustom compare-windows-recenter nil
    "*List of two values, each of which is used as argument of
--- 101,108 ----
  
  The default value 32 is good for the most cases."
    :type 'integer
!   :group 'compare-w
!   :version "22.1")
  
  (defcustom compare-windows-recenter nil
    "*List of two values, each of which is used as argument of
***************
*** 109,131 ****
  The value `(-1 0)' is useful if windows are split vertically,
  and the value `((4) (4))' for horizontally split windows."
    :type '(list sexp sexp)
!   :group 'compare-w)
  
  (defcustom compare-windows-highlight t
    "*Non-nil means compare-windows highlights the differences."
    :type 'boolean
!   :group 'compare-w)
  
  (defface compare-windows
!   '((((class color) (min-colors 88) (background light))
!      (:background "paleturquoise"))
!     (((class color) (min-colors 88) (background dark))
!      (:background "paleturquoise4"))
!     (((class color))
!      (:background "turquoise3"))
!     (t (:underline t)))
    "Face for highlighting of compare-windows difference regions."
!   :group 'compare-w)
  ;; backward-compatibility alias
  (put 'compare-windows-face 'face-alias 'compare-windows)
  
--- 112,131 ----
  The value `(-1 0)' is useful if windows are split vertically,
  and the value `((4) (4))' for horizontally split windows."
    :type '(list sexp sexp)
!   :group 'compare-w
!   :version "22.1")
  
  (defcustom compare-windows-highlight t
    "*Non-nil means compare-windows highlights the differences."
    :type 'boolean
!   :group 'compare-w
!   :version "22.1")
  
  (defface compare-windows
!   '((t :inherit lazy-highlight))
    "Face for highlighting of compare-windows difference regions."
!   :group 'compare-w
!   :version "22.1")
  ;; backward-compatibility alias
  (put 'compare-windows-face 'face-alias 'compare-windows)
  




reply via email to

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