(calendar-absolute-from-julian): Declare as a function.

[bpt/emacs.git] / lisp / log-edit.el

diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 3d01de4..5c2cf98 100644 (file)
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -1,15 +1,16 @@
 ;;; log-edit.el --- Major mode for editing CVS commit messages
 
 ;;; log-edit.el --- Major mode for editing CVS commit messages
 

-;; Copyright (C) 1999,2000,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.

 
 

-;; Author: Stefan Monnier <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>

 ;; Keywords: pcl-cvs cvs commit log
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; Keywords: pcl-cvs cvs commit log
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)

 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,


@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -35,7 +36,6 @@
 (require 'add-log)                     ; for all the ChangeLog goodies
 (require 'pcvs-util)
 (require 'ring)
 (require 'add-log)                     ; for all the ChangeLog goodies
 (require 'pcvs-util)
 (require 'ring)

-(require 'vc)

 
 ;;;;
 ;;;; Global Variables
 
 ;;;;
 ;;;; Global Variables


@@ -54,28 +54,21 @@
 \f
 ;; The main keymap
 
 \f
 ;; The main keymap
 

-;; Initialization code, to be done just once at load-time
-(defvar vc-log-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map text-mode-map)
-    (define-key map "\M-n" 'vc-next-comment)
-    (define-key map "\M-p" 'vc-previous-comment)
-    (define-key map "\M-r" 'vc-comment-search-reverse)
-    (define-key map "\M-s" 'vc-comment-search-forward)
-    (define-key map "\C-c\C-c" 'vc-finish-logentry)
-    map))
-;; Compatibility with old name.  Should we bother ?
-(defvar vc-log-entry-mode vc-log-mode-map)
-

 (easy-mmode-defmap log-edit-mode-map
   `(("\C-c\C-c" . log-edit-done)
     ("\C-c\C-a" . log-edit-insert-changelog)
     ("\C-c\C-f" . log-edit-show-files)
 (easy-mmode-defmap log-edit-mode-map
   `(("\C-c\C-c" . log-edit-done)
     ("\C-c\C-a" . log-edit-insert-changelog)
     ("\C-c\C-f" . log-edit-show-files)

-    ("\C-c?" . log-edit-mode-help))
+    ("\M-n"    . log-edit-next-comment)
+    ("\M-p"    . log-edit-previous-comment)
+    ("\M-r"    . log-edit-comment-search-backward)
+    ("\M-s"    . log-edit-comment-search-forward)
+    ("\C-c?"   . log-edit-mode-help))

   "Keymap for the `log-edit-mode' (to edit version control log messages)."
   "Keymap for the `log-edit-mode' (to edit version control log messages)."

-  :group 'log-edit
-  :inherit (if (boundp 'vc-log-entry-mode) vc-log-entry-mode
-            (if (boundp 'vc-log-mode-map) vc-log-mode-map)))
+  :group 'log-edit)
+
+;; Compatibility with old names.  Should we bother ?
+(defvar vc-log-mode-map log-edit-mode-map)
+(defvar vc-log-entry-mode vc-log-mode-map)

 
 (easy-menu-define log-edit-menu log-edit-mode-map
   "Menu used for `log-edit-mode'."
 
 (easy-menu-define log-edit-menu log-edit-mode-map
   "Menu used for `log-edit-mode'."


@@ -89,10 +82,10 @@
     ["List files" log-edit-show-files
      :help "Show the list of relevant files."]
     "--"
     ["List files" log-edit-show-files
      :help "Show the list of relevant files."]
     "--"

-    ["Previous comment" vc-previous-comment]
-    ["Next comment" vc-next-comment]
-    ["Search comment forward" vc-comment-search-forward]
-    ["Search comment backward" vc-comment-search-reverse]))
+    ["Previous comment"                log-edit-previous-comment]
+    ["Next comment"            log-edit-next-comment]
+    ["Search comment forward"  log-edit-comment-search-forward]
+    ["Search comment backward" log-edit-comment-search-backward]))

 
 (defcustom log-edit-confirm 'changed
   "*If non-nil, `log-edit-done' will request confirmation.
 
 (defcustom log-edit-confirm 'changed
   "*If non-nil, `log-edit-done' will request confirmation.


@@ -127,8 +120,10 @@ If SETUP is 'force, this variable has no effect."
                           log-edit-insert-changelog)
   "*Hook run at the end of `log-edit'."
   :group 'log-edit
                           log-edit-insert-changelog)
   "*Hook run at the end of `log-edit'."
   :group 'log-edit

-  :type '(hook :options (log-edit-insert-cvs-template
-                        log-edit-insert-changelog)))
+  :type '(hook :options (log-edit-insert-changelog
+                         log-edit-insert-cvs-rcstemplate
+                         log-edit-insert-cvs-template
+                        log-edit-insert-filenames)))

 
 (defcustom log-edit-mode-hook (if (boundp 'vc-log-mode-hook) vc-log-mode-hook)
   "*Hook run when entering `log-edit-mode'."
 
 (defcustom log-edit-mode-hook (if (boundp 'vc-log-mode-hook) vc-log-mode-hook)
   "*Hook run when entering `log-edit-mode'."


@@ -162,12 +157,12 @@ different paragraphs are unrelated.
 You could argue that the log entry for a file should contain the
 full ChangeLog paragraph mentioning the change to the file, even though
 it may mention other files, because that gives you the full context you
 You could argue that the log entry for a file should contain the
 full ChangeLog paragraph mentioning the change to the file, even though
 it may mention other files, because that gives you the full context you

-need to understand the change.  This is the behaviour you get when this
+need to understand the change.  This is the behavior you get when this

 variable is set to t.
 
 On the other hand, you could argue that the log entry for a change
 should contain only the text for the changes which occurred in that
 variable is set to t.
 
 On the other hand, you could argue that the log entry for a change
 should contain only the text for the changes which occurred in that

-file, because the log is per-file.  This is the behaviour you get
+file, because the log is per-file.  This is the behavior you get

 when this variable is set to nil.")
 
 ;;;; Internal global or buffer-local vars
 when this variable is set to nil.")
 
 ;;;; Internal global or buffer-local vars


@@ -178,19 +173,19 @@ when this variable is set to nil.")
 (defvar log-edit-listfun nil)
 (defvar log-edit-parent-buffer nil)
 
 (defvar log-edit-listfun nil)
 (defvar log-edit-parent-buffer nil)
 

-;;; Taken from VC-Log mode
+;;; Originally taken from VC-Log mode

 
 

-(defconst vc-maximum-comment-ring-size 32
+(defconst log-edit-maximum-comment-ring-size 32

   "Maximum number of saved comments in the comment ring.")
   "Maximum number of saved comments in the comment ring.")

-(defvar vc-comment-ring (make-ring vc-maximum-comment-ring-size))
-(defvar vc-comment-ring-index nil)
-(defvar vc-last-comment-match "")
+(defvar log-edit-comment-ring (make-ring log-edit-maximum-comment-ring-size))
+(defvar log-edit-comment-ring-index nil)
+(defvar log-edit-last-comment-match "")

 
 

-(defun vc-new-comment-index (stride len)
+(defun log-edit-new-comment-index (stride len)

   "Return the comment index STRIDE elements from the current one.
   "Return the comment index STRIDE elements from the current one.

-LEN is the length of `vc-comment-ring'."
+LEN is the length of `log-edit-comment-ring'."

   (mod (cond
   (mod (cond

-       (vc-comment-ring-index (+ vc-comment-ring-index stride))
+       (log-edit-comment-ring-index (+ log-edit-comment-ring-index stride))

        ;; Initialize the index on the first use of this command
        ;; so that the first M-p gets index 0, and the first M-n gets
        ;; index -1.
        ;; Initialize the index on the first use of this command
        ;; so that the first M-p gets index 0, and the first M-n gets
        ;; index -1.


@@ -198,66 +193,64 @@ LEN is the length of `vc-comment-ring'."
        (t stride))
        len))
 
        (t stride))
        len))
 

-(defun vc-previous-comment (arg)
+(defun log-edit-previous-comment (arg)

   "Cycle backwards through comment history.
 With a numeric prefix ARG, go back ARG comments."
   (interactive "*p")
   "Cycle backwards through comment history.
 With a numeric prefix ARG, go back ARG comments."
   (interactive "*p")

-  (let ((len (ring-length vc-comment-ring)))
+  (let ((len (ring-length log-edit-comment-ring)))

     (if (<= len 0)
        (progn (message "Empty comment ring") (ding))
     (if (<= len 0)
        (progn (message "Empty comment ring") (ding))

-      (erase-buffer)
-      (setq vc-comment-ring-index (vc-new-comment-index arg len))
-      (message "Comment %d" (1+ vc-comment-ring-index))
-      (insert (ring-ref vc-comment-ring vc-comment-ring-index)))))
+      ;; Don't use `erase-buffer' because we don't want to `widen'.
+      (delete-region (point-min) (point-max))
+      (setq log-edit-comment-ring-index (log-edit-new-comment-index arg len))
+      (message "Comment %d" (1+ log-edit-comment-ring-index))
+      (insert (ring-ref log-edit-comment-ring log-edit-comment-ring-index)))))

 
 

-(defun vc-next-comment (arg)
+(defun log-edit-next-comment (arg)

   "Cycle forwards through comment history.
 With a numeric prefix ARG, go forward ARG comments."
   (interactive "*p")
   "Cycle forwards through comment history.
 With a numeric prefix ARG, go forward ARG comments."
   (interactive "*p")

-  (vc-previous-comment (- arg)))
+  (log-edit-previous-comment (- arg)))

 
 

-(defun vc-comment-search-reverse (str &optional stride)
+(defun log-edit-comment-search-backward (str &optional stride)

   "Search backwards through comment history for substring match of STR.
 If the optional argument STRIDE is present, that is a step-width to use
 when going through the comment ring."
   ;; Why substring rather than regexp ?   -sm
   (interactive
   "Search backwards through comment history for substring match of STR.
 If the optional argument STRIDE is present, that is a step-width to use
 when going through the comment ring."
   ;; Why substring rather than regexp ?   -sm
   (interactive

-   (list (read-string "Comment substring: " nil nil vc-last-comment-match)))
+   (list (read-string "Comment substring: " nil nil log-edit-last-comment-match)))

   (unless stride (setq stride 1))
   (if (string= str "")
   (unless stride (setq stride 1))
   (if (string= str "")

-      (setq str vc-last-comment-match)
-    (setq vc-last-comment-match str))
+      (setq str log-edit-last-comment-match)
+    (setq log-edit-last-comment-match str))

   (let* ((str (regexp-quote str))
   (let* ((str (regexp-quote str))

-        (len (ring-length vc-comment-ring))
-        (n (vc-new-comment-index stride len)))
+        (len (ring-length log-edit-comment-ring))
+        (n (log-edit-new-comment-index stride len)))

     (while (progn (when (or (>= n len) (< n 0)) (error "Not found"))
     (while (progn (when (or (>= n len) (< n 0)) (error "Not found"))

-                 (not (string-match str (ring-ref vc-comment-ring n))))
+                 (not (string-match str (ring-ref log-edit-comment-ring n))))

       (setq n (+ n stride)))
       (setq n (+ n stride)))

-    (setq vc-comment-ring-index n)
-    (vc-previous-comment 0)))
+    (setq log-edit-comment-ring-index n)
+    (log-edit-previous-comment 0)))

 
 

-(defun vc-comment-search-forward (str)
+(defun log-edit-comment-search-forward (str)

   "Search forwards through comment history for a substring match of STR."
   (interactive
   "Search forwards through comment history for a substring match of STR."
   (interactive

-   (list (read-string "Comment substring: " nil nil vc-last-comment-match)))
-  (vc-comment-search-reverse str -1))
+   (list (read-string "Comment substring: " nil nil log-edit-last-comment-match)))
+  (log-edit-comment-search-backward str -1))

 
 

-(defun vc-comment-to-change-log (&optional whoami file-name)
+(defun log-edit-comment-to-change-log (&optional whoami file-name)

   "Enter last VC comment into the change log for the current file.
 WHOAMI (interactive prefix) non-nil means prompt for user name
 and site.  FILE-NAME is the name of the change log; if nil, use
 `change-log-default-name'.
 
   "Enter last VC comment into the change log for the current file.
 WHOAMI (interactive prefix) non-nil means prompt for user name
 and site.  FILE-NAME is the name of the change log; if nil, use
 `change-log-default-name'.
 

-This may be useful as a `vc-checkin-hook' to update change logs
+This may be useful as a `log-edit-checkin-hook' to update change logs

 automatically."
   (interactive (if current-prefix-arg
                   (list current-prefix-arg
                         (prompt-for-change-log-name))))
 automatically."
   (interactive (if current-prefix-arg
                   (list current-prefix-arg
                         (prompt-for-change-log-name))))

-  ;; Make sure the defvar for add-log-current-defun-function has been executed
-  ;; before binding it.
-  (require 'add-log)

   (let (;; Extract the comment first so we get any error before doing anything.
   (let (;; Extract the comment first so we get any error before doing anything.

-       (comment (ring-ref vc-comment-ring 0))
+       (comment (ring-ref log-edit-comment-ring 0))

        ;; Don't let add-change-log-entry insert a defun name.
        (add-log-current-defun-function 'ignore)
        end)
        ;; Don't let add-change-log-entry insert a defun name.
        (add-log-current-defun-function 'ignore)
        end)


@@ -279,8 +272,7 @@ automatically."
          (indent-to indentation))
        (setq end (point))))
     ;; Fill the inserted text, preserving open-parens at bol.
          (indent-to indentation))
        (setq end (point))))
     ;; Fill the inserted text, preserving open-parens at bol.

-    (let ((paragraph-separate (concat paragraph-separate "\\|\\s *\\s("))
-         (paragraph-start (concat paragraph-start "\\|\\s *\\s(")))
+    (let ((paragraph-start (concat paragraph-start "\\|\\s *\\s(")))

       (beginning-of-line)
       (fill-region (point) end))
     ;; Canonicalize the white space at the end of the entry so it is
       (beginning-of-line)
       (fill-region (point) end))
     ;; Canonicalize the white space at the end of the entry so it is


@@ -290,10 +282,24 @@ automatically."
     (or (eobp) (looking-at "\n\n")
        (insert "\n"))))
 
     (or (eobp) (looking-at "\n\n")
        (insert "\n"))))
 

+;; Compatibility with old names.
+(define-obsolete-variable-alias 'vc-comment-ring 'log-edit-comment-ring "22.1")
+(define-obsolete-variable-alias 'vc-comment-ring-index 'log-edit-comment-ring-index "22.1")
+(define-obsolete-function-alias 'vc-previous-comment 'log-edit-previous-comment "22.1")
+(define-obsolete-function-alias 'vc-next-comment 'log-edit-next-comment "22.1")
+(define-obsolete-function-alias 'vc-comment-search-reverse 'log-edit-comment-search-backward "22.1")
+(define-obsolete-function-alias 'vc-comment-search-forward 'log-edit-comment-search-forward "22.1")
+(define-obsolete-function-alias 'vc-comment-to-change-log 'log-edit-comment-to-change-log "22.1")
+

 ;;;
 ;;; Actual code
 ;;;
 
 ;;;
 ;;; Actual code
 ;;;
 

+(defvar log-edit-font-lock-keywords
+  '(("\\`\\(Summary:\\)\\(.*\\)"
+     (1 font-lock-keyword-face)
+     (2 font-lock-function-name-face))))
+

 ;;;###autoload
 (defun log-edit (callback &optional setup listfun buffer &rest ignore)
   "Setup a buffer to enter a log message.
 ;;;###autoload
 (defun log-edit (callback &optional setup listfun buffer &rest ignore)
   "Setup a buffer to enter a log message.


@@ -320,7 +326,7 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the
     (set (make-local-variable 'log-edit-initial-files) (log-edit-files))
     (when setup (run-hooks 'log-edit-hook))
     (goto-char (point-min)) (push-mark (point-max))
     (set (make-local-variable 'log-edit-initial-files) (log-edit-files))
     (when setup (run-hooks 'log-edit-hook))
     (goto-char (point-min)) (push-mark (point-max))

-    (message (substitute-command-keys
+    (message "%s" (substitute-command-keys

              "Press \\[log-edit-done] when you are done editing."))))
 
 (define-derived-mode log-edit-mode text-mode "Log-Edit"
              "Press \\[log-edit-done] when you are done editing."))))
 
 (define-derived-mode log-edit-mode text-mode "Log-Edit"


@@ -332,7 +338,9 @@ the package from which this is used might also provide additional
 commands (under C-x v for VC, for example).
 
 \\{log-edit-mode-map}"
 commands (under C-x v for VC, for example).
 
 \\{log-edit-mode-map}"

-  (make-local-variable 'vc-comment-ring-index))
+  (set (make-local-variable 'font-lock-defaults)
+       '(log-edit-font-lock-keywords t))
+  (make-local-variable 'log-edit-comment-ring-index))

 
 (defun log-edit-hide-buf (&optional buf where)
   (when (setq buf (get-buffer (or buf log-edit-files-buf)))
 
 (defun log-edit-hide-buf (&optional buf where)
   (when (setq buf (get-buffer (or buf log-edit-files-buf)))


@@ -361,16 +369,16 @@ If you want to abort the commit, simply delete the buffer."
        (goto-char (point-max))
        (insert ?\n)))
   (let ((comment (buffer-string)))
        (goto-char (point-max))
        (insert ?\n)))
   (let ((comment (buffer-string)))

-    (when (or (ring-empty-p vc-comment-ring)
-             (not (equal comment (ring-ref vc-comment-ring 0))))
-      (ring-insert vc-comment-ring comment)))
+    (when (or (ring-empty-p log-edit-comment-ring)
+             (not (equal comment (ring-ref log-edit-comment-ring 0))))
+      (ring-insert log-edit-comment-ring comment)))

   (let ((win (get-buffer-window log-edit-files-buf)))
     (if (and log-edit-confirm
             (not (and (eq log-edit-confirm 'changed)
                       (equal (log-edit-files) log-edit-initial-files)))
             (progn
               (log-edit-show-files)
   (let ((win (get-buffer-window log-edit-files-buf)))
     (if (and log-edit-confirm
             (not (and (eq log-edit-confirm 'changed)
                       (equal (log-edit-files) log-edit-initial-files)))
             (progn
               (log-edit-show-files)

-              (not (y-or-n-p "Really commit ? "))))
+              (not (y-or-n-p "Really commit? "))))

        (progn (when (not win) (log-edit-hide-buf))
               (message "Oh, well!  Later maybe?"))
       (run-hooks 'log-edit-done-hook)
        (progn (when (not win) (log-edit-hide-buf))
               (message "Oh, well!  Later maybe?"))
       (run-hooks 'log-edit-done-hook)


@@ -383,37 +391,12 @@ If you want to abort the commit, simply delete the buffer."
   "Return the list of files that are about to be committed."
   (ignore-errors (funcall log-edit-listfun)))
 
   "Return the list of files that are about to be committed."
   (ignore-errors (funcall log-edit-listfun)))
 

-
-(defun log-edit-insert-changelog ()
-  "Insert a log message by looking at the ChangeLog.
-The idea is to write your ChangeLog entries first, and then use this
-command to commit your changes.
-
-To select default log text, we:
-- find the ChangeLog entries for the files to be checked in,
-- verify that the top entry in the ChangeLog is on the current date
-  and by the current user; if not, we don't provide any default text,
-- search the ChangeLog entry for paragraphs containing the names of
-  the files we're checking in, and finally
-- use those paragraphs as the log text."
-  (interactive)
-  (log-edit-insert-changelog-entries (log-edit-files))
-  (log-edit-set-common-indentation)
-  (goto-char (point-min))
-  (when (looking-at "\\*\\s-+")
-    (forward-line 1)
-    (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 ()
   "Provide help for the `log-edit-mode-map'."
   (interactive)
   (if (eq last-command 'log-edit-mode-help)
       (describe-function major-mode)
 (defun log-edit-mode-help ()
   "Provide help for the `log-edit-mode-map'."
   (interactive)
   (if (eq last-command 'log-edit-mode-help)
       (describe-function major-mode)

-    (message
+    (message "%s"

      (substitute-command-keys
       "Type `\\[log-edit-done]' to finish commit.  Try `\\[describe-function] log-edit-done' for more help."))))
 
      (substitute-command-keys
       "Type `\\[log-edit-done]' to finish commit.  Try `\\[describe-function] log-edit-done' for more help."))))
 


@@ -452,22 +435,71 @@ To select default log text, we:
        (selected-window)))))
 
 (defun log-edit-insert-cvs-template ()
        (selected-window)))))
 
 (defun log-edit-insert-cvs-template ()

-  "Insert the template specified by the CVS administrator, if any."
+  "Insert the template specified by the CVS administrator, if any.
+This simply uses the local CVS/Template file."

   (interactive)
   (interactive)

-  (when (file-readable-p "CVS/Template")
-    (insert-file-contents "CVS/Template")))
-
+  (when (or (interactive-p) (= (point-min) (point-max)))
+    (when (file-readable-p "CVS/Template")
+      (insert-file-contents "CVS/Template"))))
+
+(defun log-edit-insert-cvs-rcstemplate ()
+  "Insert the rcstemplate from the CVS repository.
+This contacts the repository to get the rcstemplate file and
+can thus take some time."
+  (interactive)
+  (when (or (interactive-p) (= (point-min) (point-max)))
+    (when (file-readable-p "CVS/Root")
+      ;; Ignore the stderr stuff, even if it's an error.
+      (call-process "cvs" nil '(t nil) nil
+                    "checkout" "-p" "CVSROOT/rcstemplate"))))
+
+(defun log-edit-insert-filenames ()
+  "Insert the list of files that are to be committed."
+  (interactive)
+  (insert "Affected files:  \n"
+          (mapconcat 'identity (log-edit-files) "  \n")))

 
 (defun log-edit-add-to-changelog ()
   "Insert this log message into the appropriate ChangeLog file."
   (interactive)
   ;; Yuck!
 
 (defun log-edit-add-to-changelog ()
   "Insert this log message into the appropriate ChangeLog file."
   (interactive)
   ;; Yuck!

-  (unless (string= (buffer-string) (ring-ref vc-comment-ring 0))
-    (ring-insert vc-comment-ring (buffer-string)))
+  (unless (string= (buffer-string) (ring-ref log-edit-comment-ring 0))
+    (ring-insert log-edit-comment-ring (buffer-string)))

   (dolist (f (log-edit-files))
     (let ((buffer-file-name (expand-file-name f)))
       (save-excursion
   (dolist (f (log-edit-files))
     (let ((buffer-file-name (expand-file-name f)))
       (save-excursion

-       (vc-comment-to-change-log)))))
+       (log-edit-comment-to-change-log)))))
+
+(defvar log-edit-changelog-use-first nil)
+(defun log-edit-insert-changelog (&optional use-first)
+  "Insert a log message by looking at the ChangeLog.
+The idea is to write your ChangeLog entries first, and then use this
+command to commit your changes.
+
+To select default log text, we:
+- find the ChangeLog entries for the files to be checked in,
+- verify that the top entry in the ChangeLog is on the current date
+  and by the current user; if not, we don't provide any default text,
+- search the ChangeLog entry for paragraphs containing the names of
+  the files we're checking in, and finally
+- use those paragraphs as the log text.
+
+If the optional prefix arg USE-FIRST is given (via \\[universal-argument]),
+or if the command is repeated a second time in a row, use the first log entry
+regardless of user name or time."
+  (interactive "P")
+  (let ((log-edit-changelog-use-first
+        (or use-first (eq last-command 'log-edit-insert-changelog))))
+    (log-edit-insert-changelog-entries (log-edit-files)))
+  (log-edit-set-common-indentation)
+  (goto-char (point-min))
+  (when (looking-at "\\*\\s-+")
+    (forward-line 1)
+    (when (not (re-search-forward "^\\*\\s-+" nil t))
+      (goto-char (point-min))
+      (skip-chars-forward "^():")
+      (skip-chars-forward ": ")
+      (delete-region (point-min) (point)))))

 
 ;;;;
 ;;;; functions for getting commit message from ChangeLog a file...
 
 ;;;;
 ;;;; functions for getting commit message from ChangeLog a file...


@@ -506,7 +538,7 @@ If we are between paragraphs, return the previous paragraph."
             (point))
           (if (re-search-forward "^[ \t\n]*$" nil t)
               (match-beginning 0)
             (point))
           (if (re-search-forward "^[ \t\n]*$" nil t)
               (match-beginning 0)

-            (point)))))
+            (point-max)))))

 
 (defun log-edit-changelog-subparagraph ()
   "Return the bounds of the ChangeLog subparagraph containing point.
 
 (defun log-edit-changelog-subparagraph ()
   "Return the bounds of the ChangeLog subparagraph containing point.


@@ -536,7 +568,7 @@ for more details."
 (defvar user-mail-address)
 (defun log-edit-changelog-ours-p ()
   "See if ChangeLog entry at point is for the current user, today.
 (defvar user-mail-address)
 (defun log-edit-changelog-ours-p ()
   "See if ChangeLog entry at point is for the current user, today.

-Return non-nil iff it is."
+Return non-nil if it is."

   ;; Code adapted from add-change-log-entry.
   (let ((name (or (and (boundp 'add-log-full-name) add-log-full-name)
                  (and (fboundp 'user-full-name) (user-full-name))
   ;; Code adapted from add-change-log-entry.
   (let ((name (or (and (boundp 'add-log-full-name) add-log-full-name)
                  (and (fboundp 'user-full-name) (user-full-name))


@@ -548,7 +580,9 @@ Return non-nil iff it is."
                       (functionp add-log-time-format)
                       (funcall add-log-time-format))
                  (format-time-string "%Y-%m-%d"))))
                       (functionp add-log-time-format)
                       (funcall add-log-time-format))
                  (format-time-string "%Y-%m-%d"))))

-    (looking-at (regexp-quote (format "%s  %s  <%s>" time name mail)))))
+    (looking-at (if log-edit-changelog-use-first
+                    "[^ \t]"
+                  (regexp-quote (format "%s  %s  <%s>" time name mail))))))

 
 (defun log-edit-changelog-entries (file)
   "Return the ChangeLog entries for FILE, and the ChangeLog they came from.
 
 (defun log-edit-changelog-entries (file)
   "Return the ChangeLog entries for FILE, and the ChangeLog they came from.


@@ -556,16 +590,23 @@ The return value looks like this:
   (LOGBUFFER (ENTRYSTART . ENTRYEND) ...)
 where LOGBUFFER is the name of the ChangeLog buffer, and each
 \(ENTRYSTART . ENTRYEND\) pair is a buffer region."
   (LOGBUFFER (ENTRYSTART . ENTRYEND) ...)
 where LOGBUFFER is the name of the ChangeLog buffer, and each
 \(ENTRYSTART . ENTRYEND\) pair is a buffer region."

-  (save-excursion
-    (let ((changelog-file-name
-          (let ((default-directory
-                  (file-name-directory (expand-file-name file))))
-            ;; `find-change-log' uses `change-log-default-name' if set
-            ;; and sets it before exiting, so we need to work around
-            ;; that memoizing which is undesired here
-            (setq change-log-default-name nil)
-            (find-change-log))))
-      (set-buffer (find-file-noselect changelog-file-name))
+  (let ((changelog-file-name
+         (let ((default-directory
+                 (file-name-directory (expand-file-name file)))
+               (visiting-buffer (find-buffer-visiting file)))
+           ;; If there is a buffer visiting FILE, and it has a local
+           ;; value for `change-log-default-name', use that.
+           (if (and visiting-buffer
+                    (local-variable-p 'change-log-default-name
+                                      visiting-buffer))
+               (with-current-buffer visiting-buffer
+                 change-log-default-name)
+             ;; `find-change-log' uses `change-log-default-name' if set
+             ;; and sets it before exiting, so we need to work around
+             ;; that memoizing which is undesired here
+             (setq change-log-default-name nil)
+             (find-change-log)))))
+    (with-current-buffer (find-file-noselect changelog-file-name)

       (unless (eq major-mode 'change-log-mode) (change-log-mode))
       (goto-char (point-min))
       (if (looking-at "\\s-*\n") (goto-char (match-end 0)))
       (unless (eq major-mode 'change-log-mode) (change-log-mode))
       (goto-char (point-min))
       (if (looking-at "\\s-*\n") (goto-char (match-end 0)))


@@ -586,8 +627,12 @@ where LOGBUFFER is the name of the ChangeLog buffer, and each
                           (search-forward pattern nil t))))
                (setq pattern (file-name-nondirectory file)))
 
                           (search-forward pattern nil t))))
                (setq pattern (file-name-nondirectory file)))
 

+            (setq pattern (concat "\\(^\\|[^[:alnum:]]\\)"
+                                  pattern
+                                  "\\($\\|[^[:alnum:]]\\)"))
+

            (let (texts)
            (let (texts)

-             (while (search-forward pattern nil t)
+             (while (re-search-forward pattern nil t)

                (let ((entry (log-edit-changelog-entry)))
                  (push entry texts)
                  (goto-char (elt entry 1))))
                (let ((entry (log-edit-changelog-entry)))
                  (push entry texts)
                  (goto-char (elt entry 1))))


@@ -625,4 +670,5 @@ Sort REGIONS front-to-back first."
 
 (provide 'log-edit)
 
 
 (provide 'log-edit)
 

+;; arch-tag: 8089b39c-983b-4e83-93cd-ed0a64c7fdcc

 ;;; log-edit.el ends here
 ;;; log-edit.el ends here