diff options
| author | Joakim Verona | 2013-03-26 15:31:46 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 15:31:46 +0100 |
| commit | e11705b616777a8a72363b2037d989987630e863 (patch) | |
| tree | fda56011e9ac37da9e53762d8dc24c7a87cbee82 /src/eval.c | |
| parent | c446797d60edf1058f6cbec28e57255d245dd47b (diff) | |
| parent | cded56c19b30e038537398b5213438c339428ed9 (diff) | |
| download | emacs-e11705b616777a8a72363b2037d989987630e863.tar.gz emacs-e11705b616777a8a72363b2037d989987630e863.zip | |
conflict resolve
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 5db6f9d0bf3..69483a9b205 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1690,7 +1690,6 @@ error (const char *m, ...) | |||
| 1690 | va_list ap; | 1690 | va_list ap; |
| 1691 | va_start (ap, m); | 1691 | va_start (ap, m); |
| 1692 | verror (m, ap); | 1692 | verror (m, ap); |
| 1693 | va_end (ap); | ||
| 1694 | } | 1693 | } |
| 1695 | 1694 | ||
| 1696 | DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0, | 1695 | DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0, |