Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 12:bcdc7deadc19 r19-15b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b7
author cvs
date Mon, 13 Aug 2007 08:48:16 +0200
parents 376386a54a3c
children 9ee227acff29
comparison
equal deleted inserted replaced
11:91ffe8bd52e4 12:bcdc7deadc19
262 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end) 262 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end)
263 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end)) 263 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end))
264 ))) 264 )))
265 265
266 266
267 ;;; Local Variables:
268 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
269 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
270 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
271 ;;; End:
272
267 (provide 'ediff-merg) 273 (provide 'ediff-merg)
268 274
269 ;; ediff-merg.el ends here 275 ;; ediff-merg.el ends here