diff options
| author | Juanma Barranquero | 2010-06-09 13:24:34 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-06-09 13:24:34 +0200 |
| commit | 883ffa8ce9ee9e15f8c2904c7f30809883cab1a8 (patch) | |
| tree | d5f79edcc0e3fd7609aa68477ac8345694a601e9 | |
| parent | b978141d8bc598486bfc9917114232773ac35ea7 (diff) | |
| download | emacs-883ffa8ce9ee9e15f8c2904c7f30809883cab1a8.tar.gz emacs-883ffa8ce9ee9e15f8c2904c7f30809883cab1a8.zip | |
* vc-hg.el (log-edit-extract-headers): Remove duplicate declaration.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 100e85fea60..24f01753b48 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-06-09 Juanma Barranquero <lekktu@gmail.com> | 1 | 2010-06-09 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * vc-hg.el (log-edit-extract-headers): Remove duplicate declaration. | ||
| 4 | |||
| 3 | * net/notifications.el (dbus-register-signal): Declare function. | 5 | * net/notifications.el (dbus-register-signal): Declare function. |
| 4 | (notifications-notify): Fix typos and reflow docstring. | 6 | (notifications-notify): Fix typos and reflow docstring. |
| 5 | 7 | ||
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 4b434b582fa..d0f56f27263 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -297,8 +297,6 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 297 | ("^tag: +\\([^ ]+\\)$" (1 'highlight)) | 297 | ("^tag: +\\([^ ]+\\)$" (1 'highlight)) |
| 298 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) | 298 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) |
| 299 | 299 | ||
| 300 | (declare-function log-edit-extract-headers "log-edit" (headers string)) | ||
| 301 | |||
| 302 | (defun vc-hg-diff (files &optional oldvers newvers buffer) | 300 | (defun vc-hg-diff (files &optional oldvers newvers buffer) |
| 303 | "Get a difference report using hg between two revisions of FILES." | 301 | "Get a difference report using hg between two revisions of FILES." |
| 304 | (let* ((firstfile (car files)) | 302 | (let* ((firstfile (car files)) |