Show
Ignore:
Timestamp:
04/07/07 15:49:28 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/lisp/compare-w.el

    r4190 r4200  
    3333;;; Code: 
    3434 
    35 (defgroup compare-w nil 
     35(defgroup compare-windows nil 
    3636  "Compare text between windows." 
    3737  :prefix "compare-" 
     
    5353whitespace is considered to match, and is skipped." 
    5454  :type '(choice regexp function) 
    55   :group 'compare-w
     55  :group 'compare-windows
    5656 
    5757(defcustom compare-ignore-whitespace nil 
    5858  "*Non-nil means `compare-windows' ignores whitespace." 
    5959  :type 'boolean 
    60   :group 'compare-w 
     60  :group 'compare-windows 
    6161  :version "22.1") 
    6262 
     
    6464  "*Non-nil means `compare-windows' ignores case differences." 
    6565  :type 'boolean 
    66   :group 'compare-w
     66  :group 'compare-windows
    6767 
    6868(defcustom compare-windows-sync 'compare-windows-sync-default-function 
     
    8888be made buffer-local. 
    8989 
    90 If the value of this variable is `nil', then function `ding' is 
    91 called to beep or flash the screen when points are mismatched." 
    92   :type '(choice regexp function) 
    93   :group 'compare-w 
     90If the value of this variable is `nil' (option \"No sync\"), then 
     91no synchronization is performed, and the function `ding' is called 
     92to beep or flash the screen when points are mismatched." 
     93  :type '(choice function regexp (const :tag "No sync" nil)) 
     94  :group 'compare-windows 
    9495  :version "22.1") 
    9596 
     
    103104The default value 32 is good for the most cases." 
    104105  :type 'integer 
    105   :group 'compare-w 
     106  :group 'compare-windows 
    106107  :version "22.1") 
    107108 
     
    114115and the value `((4) (4))' for horizontally split windows." 
    115116  :type '(list sexp sexp) 
    116   :group 'compare-w 
     117  :group 'compare-windows 
    117118  :version "22.1") 
    118119 
     
    126127                 (const :tag "Persistent highlighting" persistent) 
    127128                 (other :tag "Highlight until next command" t)) 
    128   :group 'compare-w 
     129  :group 'compare-windows 
    129130  :version "22.1") 
    130131 
     
    132133  '((t :inherit lazy-highlight)) 
    133134  "Face for highlighting of compare-windows difference regions." 
    134   :group 'compare-w 
     135  :group 'compare-windows 
    135136  :version "22.1") 
    136137