Mercurial > emacs
comparison lisp/smerge-mode.el @ 86234:860a7a8e779e
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
* play/yow.el (doctor-ret-or-read):
* vc-hooks.el (vc-dired-resynch-file):
* vc-hg.el (log-view-get-marked):
* smerge-mode.el (ediff-cleanup-mess):
* pcvs.el (vc-editable-p, vc-checkout):
* pcomplete.el (comint-bol):
* informat.el (texinfo-format-refill):
* ido.el (tramp-tramp-file-p):
* ibuffer.el (ibuffer-mark-on-buffer, ibuffer-format-qualifier)
(ibuffer-generate-filter-groups)
(ibuffer-format-filter-group-data):
* add-log.el (c-beginning-of-defun, c-end-of-defun): Declare as
functions.
* ido.el (ido-file-internal): Move with-no-warnings to include the
ffap-string-at-point call.
* pcomplete.el (pcomplete-executables): Move defsubst before first
use.
* vc-hg.el (vc-hg-revision-table): Fix last change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 19 Nov 2007 08:50:04 +0000 |
| parents | ac6bbbd64b2f |
| children | 107ccd98fa12 53108e6cea98 |
comparison
equal
deleted
inserted
replaced
| 86233:851a18a6e906 | 86234:860a7a8e779e |
|---|---|
| 903 (defvar ediff-buffer-A) | 903 (defvar ediff-buffer-A) |
| 904 (defvar ediff-buffer-B) | 904 (defvar ediff-buffer-B) |
| 905 (defvar ediff-buffer-C) | 905 (defvar ediff-buffer-C) |
| 906 (defvar ediff-ancestor-buffer) | 906 (defvar ediff-ancestor-buffer) |
| 907 (defvar ediff-quit-hook) | 907 (defvar ediff-quit-hook) |
| 908 (declare-function ediff-cleanup-mess "ediff-util" nil) | |
| 908 | 909 |
| 909 ;;;###autoload | 910 ;;;###autoload |
| 910 (defun smerge-ediff (&optional name-mine name-other name-base) | 911 (defun smerge-ediff (&optional name-mine name-other name-base) |
| 911 "Invoke ediff to resolve the conflicts. | 912 "Invoke ediff to resolve the conflicts. |
| 912 NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the | 913 NAME-MINE, NAME-OTHER, and NAME-BASE, if non-nil, are used for the |