(log-edit-done): Cleanup trailing empty lines.

(log-edit-insert-changelog): Drop `:' as well.

2 files changed, 17 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1d31a94638..e614d1f3245 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2000-05-20  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * log-edit.el (log-edit-done): Cleanup trailing empty lines.
+        (log-edit-insert-changelog): Drop `:' as well.
+
+        * log-view.el: Fix file description.
+        (log-view-mode-map): Unsatisfying fix for when cvs-mode-map is not
+        available.
+        (log-view-font-lock-keywords): Only use cvs-filename-face if present.
+        (log-view-current-file): Only use cvs-pcl-cvs-dirchange-re if present.
+
         * emacs-lisp/easy-mmode.el: Update copyright and commentary.
         (easy-mmode-define-toggle): Deprecate the use of *-(on|off)-hook.
         Print a status message if the toggle is called interactively.
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 37fe7068f9a..baba75e08c5 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -5,7 +5,7 @@
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
 ;; Keywords: pcl-cvs cvs commit log
 ;; Version: $Name:  $
-;; Revision: $Id: log-edit.el,v 1.3 2000/03/26 23:05:12 monnier Exp $
+;; Revision: $Id: log-edit.el,v 1.4 2000/05/10 22:20:51 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -189,6 +189,12 @@ commands (under C-x v for VC, for example).
   "Finish editing the log message and commit the files.
 If you want to abort the commit, simply delete the buffer."
   (interactive)
+  ;; Get rid of trailing empty lines
+  (goto-char (point-max))
+  (skip-syntax-backward " ")
+  (when (equal (char-after) ?\n) (forward-char 1))
+  (delete-region (point) (point-max))
+  ;; Check for final newline
   (if (and (> (point-max) 1)
            (/= (char-after (1- (point-max))) ?\n)
            (or (eq log-edit-require-final-newline t)
@@ -242,6 +248,7 @@ To select default log text, we:
     (when (not (re-search-forward "^\\*\\s-+" nil t))
       (goto-char (point-min))
       (skip-chars-forward "^():")
+      (skip-chars-forward ": ")
       (delete-region (point-min) (point)))))
 
 (defun log-edit-mode-help ()