Mercurial > emacs
comparison lisp/ediff-hook.el @ 85973:d3e87ee5aa0e
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-923
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 09 Nov 2007 09:45:30 +0000 |
| parents | f873840f9fea dc9a8fab33bb |
| children | 107ccd98fa12 880960b70474 |
comparison
equal
deleted
inserted
replaced
| 85972:51aa47312c4b | 85973:d3e87ee5aa0e |
|---|---|
| 259 ;; arrange for autoloads | 259 ;; arrange for autoloads |
| 260 (if purify-flag | 260 (if purify-flag |
| 261 () ; if dumping, autoloads are set up in loaddefs.el | 261 () ; if dumping, autoloads are set up in loaddefs.el |
| 262 ;; if the user decides to load this file, set up autoloads | 262 ;; if the user decides to load this file, set up autoloads |
| 263 ;; compare files and buffers | 263 ;; compare files and buffers |
| 264 (autoload 'ediff "ediff" "Compare two files" t) | 264 (autoload 'ediff "ediff" "Compare two files." t) |
| 265 (autoload 'ediff-files "ediff" "Compare two files" t) | 265 (autoload 'ediff-files "ediff" "Compare two files." t) |
| 266 (autoload 'ediff-buffers "ediff" "Compare two bufers" t) | 266 (autoload 'ediff-buffers "ediff" "Compare two buffers." t) |
| 267 (autoload 'ebuffers "ediff" "Compare two bufers" t) | 267 (autoload 'ebuffers "ediff" "Compare two buffers." t) |
| 268 (autoload 'ediff3 "ediff" "Compare three files" t) | 268 (autoload 'ediff3 "ediff" "Compare three files." t) |
| 269 (autoload 'ediff-files3 "ediff" "Compare three files" t) | 269 (autoload 'ediff-files3 "ediff" "Compare three files." t) |
| 270 (autoload 'ediff-buffers3 "ediff" "Compare three bufers" t) | 270 (autoload 'ediff-buffers3 "ediff" "Compare three buffers." t) |
| 271 (autoload 'ebuffers3 "ediff" "Compare three bufers" t) | 271 (autoload 'ebuffers3 "ediff" "Compare three buffers." t) |
| 272 | 272 |
| 273 (autoload 'erevision "ediff" "Compare versions of a file" t) | 273 (autoload 'erevision "ediff" "Compare versions of a file." t) |
| 274 (autoload 'ediff-revision "ediff" "Compare versions of a file" t) | 274 (autoload 'ediff-revision "ediff" "Compare versions of a file." t) |
| 275 | 275 |
| 276 ;; compare regions and windows | 276 ;; compare regions and windows |
| 277 (autoload 'ediff-windows-wordwise | 277 (autoload 'ediff-windows-wordwise |
| 278 "ediff" "Compare two windows word-by-word." t) | 278 "ediff" "Compare two windows word-by-word." t) |
| 279 (autoload 'ediff-regions-wordwise | 279 (autoload 'ediff-regions-wordwise |