Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff-merg.el @ 78:c7528f8e288d r20-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b34
author cvs
date Mon, 13 Aug 2007 09:05:42 +0200
parents 131b0175ea99
children 1ce6082ce73f
comparison
equal deleted inserted replaced
77:6cb4f478e7bc 78:c7528f8e288d
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