diff options
| author | Dan Nicolaescu <[email protected]> | 2007-11-19 08:50:04 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2007-11-19 08:50:04 +0000 |
| commit | 004a00f4ae0d64a86265c0fa6d6d52f0fa3d9434 (patch) | |
| tree | e661ecc8f97e143e46597c525f60e1118aa26a9e /lisp/smerge-mode.el | |
| parent | 34cf517c8d71e723df9d6d43b9ff8fc733bd1485 (diff) | |
* 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.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 18ca1a3418..dcbb97bd79 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -905,6 +905,7 @@ replace chars to try and eliminate some spurious differences." (defvar ediff-buffer-C) (defvar ediff-ancestor-buffer) (defvar ediff-quit-hook) +(declare-function ediff-cleanup-mess "ediff-util" nil) ;;;###autoload (defun smerge-ediff (&optional name-mine name-other name-base) |