/[emacs]/emacs/lisp/compare-w.el
ViewVC logotype

Diff of /emacs/lisp/compare-w.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.28 by lute, Mon Jul 4 23:08:52 2005 UTC revision 1.29 by jurta, Tue Jul 19 11:19:13 2005 UTC
# Line 56  whitespace is considered to match, and i Line 56  whitespace is considered to match, and i
56  (defcustom compare-ignore-whitespace nil  (defcustom compare-ignore-whitespace nil
57    "*Non-nil means `compare-windows' ignores whitespace."    "*Non-nil means `compare-windows' ignores whitespace."
58    :type 'boolean    :type 'boolean
59    :group 'compare-w)    :group 'compare-w
60      :version "22.1")
61    
62  (defcustom compare-ignore-case nil  (defcustom compare-ignore-case nil
63    "*Non-nil means `compare-windows' ignores case differences."    "*Non-nil means `compare-windows' ignores case differences."
# Line 88  be made buffer-local. Line 89  be made buffer-local.
89  If the value of this variable is `nil', then function `ding' is  If the value of this variable is `nil', then function `ding' is
90  called to beep or flash the screen when points are mismatched."  called to beep or flash the screen when points are mismatched."
91    :type '(choice regexp function)    :type '(choice regexp function)
92    :group 'compare-w)    :group 'compare-w
93      :version "22.1")
94    
95  (defcustom compare-windows-sync-string-size 32  (defcustom compare-windows-sync-string-size 32
96    "*Size of string from one window that is searched in second window.    "*Size of string from one window that is searched in second window.
# Line 99  difference regions more coarse-grained. Line 101  difference regions more coarse-grained.
101    
102  The default value 32 is good for the most cases."  The default value 32 is good for the most cases."
103    :type 'integer    :type 'integer
104    :group 'compare-w)    :group 'compare-w
105      :version "22.1")
106    
107  (defcustom compare-windows-recenter nil  (defcustom compare-windows-recenter nil
108    "*List of two values, each of which is used as argument of    "*List of two values, each of which is used as argument of
# Line 109  matching points side-by-side. Line 112  matching points side-by-side.
112  The value `(-1 0)' is useful if windows are split vertically,  The value `(-1 0)' is useful if windows are split vertically,
113  and the value `((4) (4))' for horizontally split windows."  and the value `((4) (4))' for horizontally split windows."
114    :type '(list sexp sexp)    :type '(list sexp sexp)
115    :group 'compare-w)    :group 'compare-w
116      :version "22.1")
117    
118  (defcustom compare-windows-highlight t  (defcustom compare-windows-highlight t
119    "*Non-nil means compare-windows highlights the differences."    "*Non-nil means compare-windows highlights the differences."
120    :type 'boolean    :type 'boolean
121    :group 'compare-w)    :group 'compare-w
122      :version "22.1")
123    
124  (defface compare-windows  (defface compare-windows
125    '((((class color) (min-colors 88) (background light))    '((t :inherit lazy-highlight))
      (:background "paleturquoise"))  
     (((class color) (min-colors 88) (background dark))  
      (:background "paleturquoise4"))  
     (((class color))  
      (:background "turquoise3"))  
     (t (:underline t)))  
126    "Face for highlighting of compare-windows difference regions."    "Face for highlighting of compare-windows difference regions."
127    :group 'compare-w)    :group 'compare-w
128      :version "22.1")
129  ;; backward-compatibility alias  ;; backward-compatibility alias
130  (put 'compare-windows-face 'face-alias 'compare-windows)  (put 'compare-windows-face 'face-alias 'compare-windows)
131    

Legend:
Removed from v.1.28  
changed lines
  Added in v.1.29

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26