diff options
| author | Glenn Morris | 2011-02-02 23:33:16 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-02 23:33:16 -0800 |
| commit | 219ea611fdcd9bd294288a2d5fcd8d5522b7acd0 (patch) | |
| tree | aba831107e331b761df4c0119704da2d946816a9 | |
| parent | 8d7b5b5ba95e5e4ca6973a8a4a0f0671816d6dde (diff) | |
| download | emacs-219ea611fdcd9bd294288a2d5fcd8d5522b7acd0.tar.gz emacs-219ea611fdcd9bd294288a2d5fcd8d5522b7acd0.zip | |
* lisp/vc/vc-hg.el (vc-hg-command): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07610a6fb6c..7759fb3d377 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-02-03 Glenn Morris <rgm@gnu.org> | 1 | 2011-02-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * vc/vc-hg.el (vc-hg-command): Doc fix. | ||
| 4 | |||
| 3 | * term/w32-win.el (libpng-version): Declare for compiler. | 5 | * term/w32-win.el (libpng-version): Declare for compiler. |
| 4 | 6 | ||
| 5 | * msb.el: No need to load dired while compiling. | 7 | * msb.el: No need to load dired while compiling. |
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 7a0b8540ca3..10348544357 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -662,8 +662,8 @@ This runs the command \"hg merge\"." | |||
| 662 | 662 | ||
| 663 | (defun vc-hg-command (buffer okstatus file-or-list &rest flags) | 663 | (defun vc-hg-command (buffer okstatus file-or-list &rest flags) |
| 664 | "A wrapper around `vc-do-command' for use in vc-hg.el. | 664 | "A wrapper around `vc-do-command' for use in vc-hg.el. |
| 665 | The difference to vc-do-command is that this function always invokes `hg', | 665 | This function differs from vc-do-command in that it invokes |
| 666 | and that it passes `vc-hg-global-switches' to it before FLAGS." | 666 | `vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS." |
| 667 | (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list | 667 | (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list |
| 668 | (if (stringp vc-hg-global-switches) | 668 | (if (stringp vc-hg-global-switches) |
| 669 | (cons vc-hg-global-switches flags) | 669 | (cons vc-hg-global-switches flags) |