summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-07-09 03:47:06 +0000
committerRichard M. Stallman <rms@gnu.org>1998-07-09 03:47:06 +0000
commit262c8ceae77e12c6889d6b8ee9cba3864cb16ca1 (patch)
tree57d5108dc1d3bf9277fe537b5a5c07c37d6072d4
parent56d25ff57f9920eb431ad8c4d489375e6823533d (diff)
downloademacs-262c8ceae77e12c6889d6b8ee9cba3864cb16ca1.tar.gz
Comment change.
-rw-r--r--lisp/vc.el3
-rw-r--r--src/fns.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index f54a7b325de..c5bef750f8b 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
-;; $Id: vc.el,v 1.233 1998/06/21 14:29:07 eliz Exp rms $
+;; $Id: vc.el,v 1.234 1998/07/08 02:55:50 rms Exp rms $
;; This file is part of GNU Emacs.
@@ -1241,6 +1241,7 @@ May be useful as a `vc-checkin-hook' to update change logs automatically."
(let ((logbuf (get-buffer "*VC-log*")))
(cond (logbuf
(delete-windows-on logbuf (selected-frame))
+ ;; Kill buffer and delete any other dedicated windows/frames.
(kill-buffer logbuf))))
;; Now make sure we see the expanded headers
(if buffer-file-name
diff --git a/src/fns.c b/src/fns.c
index e34d06748e6..779c4af9d43 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -772,7 +772,7 @@ concat (nargs, args, target_type, last_special)
XCONS (prev)->cdr = last_tail;
if (maybe_combine_byte)
- /* Characater counter of the multibyte string VAL may be wrong
+ /* Character counter of the multibyte string VAL may be wrong
because of byte combining problem. We must re-calculate it. */
XSTRING (val)->size = multibyte_chars_in_text (XSTRING (val)->data,
XSTRING (val)->size_byte);