(calc-describe-key): Add angles to special key descriptions.
[bpt/emacs.git] / lisp / add-log.el
CommitLineData
5abdc915 1;;; add-log.el --- change log maintenance commands for Emacs
84fc2cfa 2
e91081eb 3;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001,
409cc4a3 4;; 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
84fc2cfa 5
6228c05b 6;; Maintainer: FSF
df63ae66 7;; Keywords: tools
e9571d2a 8
84fc2cfa
ER
9;; This file is part of GNU Emacs.
10
eb3fa2cf 11;; GNU Emacs is free software: you can redistribute it and/or modify
84fc2cfa 12;; it under the terms of the GNU General Public License as published by
eb3fa2cf
GM
13;; the Free Software Foundation, either version 3 of the License, or
14;; (at your option) any later version.
84fc2cfa
ER
15
16;; GNU Emacs is distributed in the hope that it will be useful,
17;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19;; GNU General Public License for more details.
20
21;; You should have received a copy of the GNU General Public License
eb3fa2cf 22;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
84fc2cfa 23
e41b2db1
ER
24;;; Commentary:
25
26;; This facility is documented in the Emacs Manual.
27
b0a96f7b
SM
28;; Todo:
29
30;; - Find/use/create _MTN/log if there's a _MTN directory.
31;; - Find/use/create ++log.* if there's an {arch} directory.
32;; - Use an open *VC-Log* or *cvs-commit* buffer if it's related to the
33;; source file.
34;; - Don't add TAB indents (and username?) if inserting entries in those
35;; special places.
36
fd7fa35a 37;;; Code:
84fc2cfa 38
776d8e16 39(eval-when-compile
5960adc7 40 (require 'timezone))
3697b807 41
fcad5199 42(defgroup change-log nil
7b297602 43 "Change log maintenance."
fcad5199 44 :group 'tools
3697b807 45 :link '(custom-manual "(emacs)Change Log")
fcad5199
RS
46 :prefix "change-log-"
47 :prefix "add-log-")
84fc2cfa 48
fcad5199
RS
49
50(defcustom change-log-default-name nil
b0a96f7b 51 "Name of a change log file for \\[add-change-log-entry]."
fcad5199
RS
52 :type '(choice (const :tag "default" nil)
53 string)
54 :group 'change-log)
10b35c39 55(put 'change-log-default-name 'safe-local-variable 'string-or-null-p)
fcad5199 56
c3979f12
DL
57(defcustom change-log-mode-hook nil
58 "Normal hook run by `change-log-mode'."
59 :type 'hook
60 :group 'change-log)
61
c882e115
RS
62;; Many modes set this variable, so avoid warnings.
63;;;###autoload
fcad5199 64(defcustom add-log-current-defun-function nil
bb042dc6 65 "If non-nil, function to guess name of surrounding function.
5960adc7
DL
66It is used by `add-log-current-defun' in preference to built-in rules.
67Returns function's name as a string, or nil if outside a function."
cea3855a 68 :type '(choice (const nil) function)
fcad5199 69 :group 'change-log)
6258d3af 70
29db528b 71;;;###autoload
fcad5199 72(defcustom add-log-full-name nil
bb042dc6 73 "Full name of user, for inclusion in ChangeLog daily headers.
075a6629 74This defaults to the value returned by the function `user-full-name'."
fcad5199
RS
75 :type '(choice (const :tag "Default" nil)
76 string)
77 :group 'change-log)
02ec1592 78
29db528b 79;;;###autoload
fcad5199 80(defcustom add-log-mailing-address nil
d1921057 81 "Email addresses of user, for inclusion in ChangeLog headers.
c1b3ae42
CW
82This defaults to the value of `user-mail-address'. In addition to
83being a simple string, this value can also be a list. All elements
84will be recognized as referring to the same user; when creating a new
85ChangeLog entry, one element will be chosen at random."
fcad5199 86 :type '(choice (const :tag "Default" nil)
24f4201f
MR
87 (string :tag "String")
88 (repeat :tag "List of Strings" string))
fcad5199
RS
89 :group 'change-log)
90
df63ae66 91(defcustom add-log-time-format 'add-log-iso8601-time-string
d1921057 92 "Function that defines the time format.
df63ae66
RS
93For example, `add-log-iso8601-time-string', which gives the
94date in international ISO 8601 format,
95and `current-time-string' are two valid values."
96 :type '(radio (const :tag "International ISO 8601 format"
97 add-log-iso8601-time-string)
98 (const :tag "Old format, as returned by `current-time-string'"
99 current-time-string)
100 (function :tag "Other"))
101 :group 'change-log)
02ec1592 102
83afd62c 103(defcustom add-log-keep-changes-together nil
d1921057 104 "If non-nil, normally keep day's log entries for one file together.
3697b807
DL
105
106Log entries for a given file made with \\[add-change-log-entry] or
107\\[add-change-log-entry-other-window] will only be added to others \
108for that file made
109today if this variable is non-nil or that file comes first in today's
110entries. Otherwise another entry for that file will be started. An
111original log:
112
113 * foo (...): ...
114 * bar (...): change 1
83afd62c 115
3697b807
DL
116in the latter case, \\[add-change-log-entry-other-window] in a \
117buffer visiting `bar', yields:
83afd62c 118
3697b807
DL
119 * bar (...): -!-
120 * foo (...): ...
121 * bar (...): change 1
83afd62c 122
3697b807 123and in the former:
83afd62c 124
3697b807
DL
125 * foo (...): ...
126 * bar (...): change 1
127 (...): -!-
83afd62c 128
3697b807
DL
129The NEW-ENTRY arg to `add-change-log-entry' can override the effect of
130this variable."
131 :version "20.3"
83afd62c
KH
132 :type 'boolean
133 :group 'change-log)
134
598f34fa 135(defcustom add-log-always-start-new-record nil
d1921057 136 "If non-nil, `add-change-log-entry' will always start a new record."
bf247b6e 137 :version "22.1"
598f34fa
SS
138 :type 'boolean
139 :group 'change-log)
140
d68f7f1b 141(defcustom add-log-buffer-file-name-function nil
d1921057 142 "If non-nil, function to call to identify the full filename of a buffer.
d68f7f1b
SM
143This function is called with no argument. If this is nil, the default is to
144use `buffer-file-name'."
cea3855a 145 :type '(choice (const nil) function)
d68f7f1b
SM
146 :group 'change-log)
147
666f4056 148(defcustom add-log-file-name-function nil
d1921057 149 "If non-nil, function to call to identify the filename for a ChangeLog entry.
075a6629
DL
150This function is called with one argument, the value of variable
151`buffer-file-name' in that buffer. If this is nil, the default is to
152use the file's name relative to the directory of the change log file."
cea3855a 153 :type '(choice (const nil) function)
666f4056
RS
154 :group 'change-log)
155
776d8e16
GM
156
157(defcustom change-log-version-info-enabled nil
bb042dc6 158 "If non-nil, enable recording version numbers with the changes."
776d8e16
GM
159 :version "21.1"
160 :type 'boolean
161 :group 'change-log)
162
163(defcustom change-log-version-number-regexp-list
164 (let ((re "\\([0-9]+\.[0-9.]+\\)"))
165 (list
166 ;; (defconst ad-version "2.15"
167 (concat "^(def[^ \t\n]+[ \t]+[^ \t\n][ \t]\"" re)
168 ;; Revision: pcl-cvs.el,v 1.72 1999/09/05 20:21:54 monnier Exp
5960adc7 169 (concat "^;+ *Revision: +[^ \t\n]+[ \t]+" re)))
bb042dc6 170 "List of regexps to search for version number.
5960adc7 171The version number must be in group 1.
776d8e16
GM
172Note: The search is conducted only within 10%, at the beginning of the file."
173 :version "21.1"
174 :type '(repeat regexp)
175 :group 'change-log)
176
fe735a8d 177(defface change-log-date
163f7b71
GM
178 '((t (:inherit font-lock-string-face)))
179 "Face used to highlight dates in date lines."
180 :version "21.1"
181 :group 'change-log)
fe735a8d
MB
182;; backward-compatibility alias
183(put 'change-log-date-face 'face-alias 'change-log-date)
163f7b71 184
fe735a8d 185(defface change-log-name
163f7b71
GM
186 '((t (:inherit font-lock-constant-face)))
187 "Face for highlighting author names."
188 :version "21.1"
189 :group 'change-log)
fe735a8d
MB
190;; backward-compatibility alias
191(put 'change-log-name-face 'face-alias 'change-log-name)
163f7b71 192
fe735a8d 193(defface change-log-email
163f7b71
GM
194 '((t (:inherit font-lock-variable-name-face)))
195 "Face for highlighting author email addresses."
196 :version "21.1"
197 :group 'change-log)
fe735a8d
MB
198;; backward-compatibility alias
199(put 'change-log-email-face 'face-alias 'change-log-email)
163f7b71 200
fe735a8d 201(defface change-log-file
163f7b71
GM
202 '((t (:inherit font-lock-function-name-face)))
203 "Face for highlighting file names."
204 :version "21.1"
205 :group 'change-log)
fe735a8d
MB
206;; backward-compatibility alias
207(put 'change-log-file-face 'face-alias 'change-log-file)
163f7b71 208
fe735a8d 209(defface change-log-list
163f7b71
GM
210 '((t (:inherit font-lock-keyword-face)))
211 "Face for highlighting parenthesized lists of functions or variables."
212 :version "21.1"
213 :group 'change-log)
fe735a8d
MB
214;; backward-compatibility alias
215(put 'change-log-list-face 'face-alias 'change-log-list)
598f34fa 216
fe735a8d 217(defface change-log-conditionals
163f7b71
GM
218 '((t (:inherit font-lock-variable-name-face)))
219 "Face for highlighting conditionals of the form `[...]'."
220 :version "21.1"
221 :group 'change-log)
fe735a8d
MB
222;; backward-compatibility alias
223(put 'change-log-conditionals-face 'face-alias 'change-log-conditionals)
163f7b71 224
fe735a8d 225(defface change-log-function
163f7b71
GM
226 '((t (:inherit font-lock-variable-name-face)))
227 "Face for highlighting items of the form `<....>'."
228 :version "21.1"
229 :group 'change-log)
fe735a8d
MB
230;; backward-compatibility alias
231(put 'change-log-function-face 'face-alias 'change-log-function)
163f7b71 232
fe735a8d 233(defface change-log-acknowledgement
163f7b71
GM
234 '((t (:inherit font-lock-comment-face)))
235 "Face for highlighting acknowledgments."
236 :version "21.1"
237 :group 'change-log)
fe735a8d
MB
238;; backward-compatibility alias
239(put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement)
776d8e16 240
a28ed9e5 241(defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)")
000605b3 242(defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*")
a28ed9e5 243
5f562719 244(defvar change-log-font-lock-keywords
a28ed9e5 245 `(;;
080525ae
KH
246 ;; Date lines, new (2000-01-01) and old (Sat Jan 1 00:00:00 2000) styles.
247 ;; Fixme: this regepx is just an approximate one and may match
248 ;; wrongly with a non-date line existing as a random note. In
249 ;; addition, using any kind of fixed setting like this doesn't
250 ;; work if a user customizes add-log-time-format.
251 ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+"
252 (0 'change-log-date-face)
97a3278b 253 ;; Name and e-mail; some people put e-mail in parens, not angles.
7397a79f 254 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
fe735a8d
MB
255 (1 'change-log-name)
256 (2 'change-log-email)))
5572c1d1
SM
257 ;;
258 ;; File names.
a28ed9e5 259 (,change-log-file-names-re
fe735a8d 260 (2 'change-log-file)
97a3278b 261 ;; Possibly further names in a list:
fe735a8d 262 ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file))
97a3278b 263 ;; Possibly a parenthesized list of names:
171c707b 264 ("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
fe735a8d 265 nil nil (1 'change-log-list))
171c707b 266 ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
fe735a8d 267 nil nil (1 'change-log-list)))
5572c1d1
SM
268 ;;
269 ;; Function or variable names.
9e4b54a0 270 ("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
fe735a8d 271 (2 'change-log-list)
171c707b 272 ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
fe735a8d 273 (1 'change-log-list)))
5572c1d1
SM
274 ;;
275 ;; Conditionals.
fe735a8d 276 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals))
5572c1d1 277 ;;
a8d693d8 278 ;; Function of change.
fe735a8d 279 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function))
a8d693d8 280 ;;
a3cab9f0 281 ;; Acknowledgements.
a8e10524
RS
282 ;; Don't include plain "From" because that is vague;
283 ;; we want to encourage people to say something more specific.
c50089c9
RS
284 ;; Note that the FSF does not use "Patches by"; our convention
285 ;; is to put the name of the author of the changes at the top
286 ;; of the change log entry.
9e4b54a0 287 ("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
fe735a8d 288 3 'change-log-acknowledgement))
5f562719
RS
289 "Additional expressions to highlight in Change Log mode.")
290
a28ed9e5
DN
291(defun change-log-search-file-name (where)
292 "Return the file-name for the change under point."
293 (save-excursion
294 (goto-char where)
295 (beginning-of-line 1)
000605b3
DN
296 (if (looking-at change-log-start-entry-re)
297 ;; We are at the start of an entry, search forward for a file
298 ;; name.
299 (progn
300 (re-search-forward change-log-file-names-re nil t)
301 (match-string 2))
302 (if (looking-at change-log-file-names-re)
303 ;; We found a file name.
304 (match-string 2)
305 ;; Look backwards for either a file name or the log entry start.
306 (if (re-search-backward
307 (concat "\\(" change-log-start-entry-re
308 "\\)\\|\\("
309 change-log-file-names-re "\\)") nil t)
310 (if (match-beginning 1)
311 ;; We got the start of the entry, look forward for a
312 ;; file name.
313 (progn
314 (re-search-forward change-log-file-names-re nil t)
315 (match-string 2))
316 (match-string 4))
317 ;; We must be before any file name, look forward.
318 (re-search-forward change-log-file-names-re nil t)
319 (match-string 2))))))
a28ed9e5
DN
320
321(defun change-log-find-file ()
322 "Visit the file for the change under point."
323 (interactive)
324 (let ((file (change-log-search-file-name (point))))
325 (if (and file (file-exists-p file))
326 (find-file file)
000605b3 327 (message "No such file or directory: %s" file))))
a28ed9e5 328
3066d4ad
SM
329(defvar change-log-mode-map
330 (let ((map (make-sparse-keymap)))
331 (define-key map [?\C-c ?\C-p] 'add-log-edit-prev-comment)
332 (define-key map [?\C-c ?\C-n] 'add-log-edit-next-comment)
a28ed9e5 333 (define-key map [?\C-c ?\C-f] 'change-log-find-file)
3066d4ad 334 map)
45c50c5d 335 "Keymap for Change Log major mode.")
45c50c5d 336
d1921057
SM
337;; It used to be called change-log-time-zone-rule but really should be
338;; called add-log-time-zone-rule since it's only used from add-log-* code.
339(defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule)
340(defvar add-log-time-zone-rule nil
51bd1843
EN
341 "Time zone used for calculating change log time stamps.
342It takes the same format as the TZ argument of `set-time-zone-rule'.
d1921057
SM
343If nil, use local time.
344If t, use universal time.")
d52c204b
RS
345(put 'add-log-time-zone-rule 'safe-local-variable
346 '(lambda (x) (or (booleanp x) (stringp x))))
51bd1843 347
0739a962 348(defun add-log-iso8601-time-zone (&optional time)
51bd1843
EN
349 (let* ((utc-offset (or (car (current-time-zone time)) 0))
350 (sign (if (< utc-offset 0) ?- ?+))
351 (sec (abs utc-offset))
352 (ss (% sec 60))
353 (min (/ sec 60))
354 (mm (% min 60))
355 (hh (/ min 60)))
356 (format (cond ((not (zerop ss)) "%c%02d:%02d:%02d")
357 ((not (zerop mm)) "%c%02d:%02d")
358 (t "%c%02d"))
359 sign hh mm ss)))
360
d1921057
SM
361(defvar add-log-iso8601-with-time-zone nil)
362
df63ae66 363(defun add-log-iso8601-time-string ()
0739a962
SM
364 (let ((time (format-time-string "%Y-%m-%d"
365 nil (eq t add-log-time-zone-rule))))
d1921057
SM
366 (if add-log-iso8601-with-time-zone
367 (concat time " " (add-log-iso8601-time-zone))
368 time)))
df63ae66 369
84fc2cfa 370(defun change-log-name ()
075a6629 371 "Return (system-dependent) default name for a change log file."
84fc2cfa 372 (or change-log-default-name
513063cf 373 (if (eq system-type 'vax-vms)
4a047d23
RS
374 "$CHANGE_LOG$.TXT"
375 "ChangeLog")))
84fc2cfa 376
3066d4ad
SM
377(defun add-log-edit-prev-comment (arg)
378 "Cycle backward through Log-Edit mode comment history.
379With a numeric prefix ARG, go back ARG comments."
380 (interactive "*p")
381 (save-restriction
382 (narrow-to-region (point)
383 (if (memq last-command '(add-log-edit-prev-comment
384 add-log-edit-next-comment))
385 (mark) (point)))
386 (when (fboundp 'log-edit-previous-comment)
387 (log-edit-previous-comment arg)
388 (indent-region (point-min) (point-max))
389 (goto-char (point-min))
390 (unless (save-restriction (widen) (bolp))
391 (delete-region (point) (progn (skip-chars-forward " \t\n") (point))))
392 (set-mark (point-min))
393 (goto-char (point-max))
394 (delete-region (point) (progn (skip-chars-backward " \t\n") (point))))))
395
396(defun add-log-edit-next-comment (arg)
397 "Cycle forward through Log-Edit mode comment history.
398With a numeric prefix ARG, go back ARG comments."
399 (interactive "*p")
400 (add-log-edit-prev-comment (- arg)))
401
287d149f 402;;;###autoload
84fc2cfa
ER
403(defun prompt-for-change-log-name ()
404 "Prompt for a change log name."
117aaf60
KH
405 (let* ((default (change-log-name))
406 (name (expand-file-name
407 (read-file-name (format "Log file (default %s): " default)
408 nil default))))
409 ;; Handle something that is syntactically a directory name.
410 ;; Look for ChangeLog or whatever in that directory.
411 (if (string= (file-name-nondirectory name) "")
412 (expand-file-name (file-name-nondirectory default)
413 name)
414 ;; Handle specifying a file that is a directory.
415 (if (file-directory-p name)
416 (expand-file-name (file-name-nondirectory default)
417 (file-name-as-directory name))
418 name))))
84fc2cfa 419
776d8e16 420(defun change-log-version-number-search ()
5960adc7 421 "Return version number of current buffer's file.
ac3f4c6f 422This is the value returned by `vc-working-revision' or, if that is
5960adc7 423nil, by matching `change-log-version-number-regexp-list'."
776d8e16 424 (let* ((size (buffer-size))
fc9b0554 425 (limit
5960adc7
DL
426 ;; The version number can be anywhere in the file, but
427 ;; restrict search to the file beginning: 10% should be
428 ;; enough to prevent some mishits.
776d8e16 429 ;;
5960adc7
DL
430 ;; Apply percentage only if buffer size is bigger than
431 ;; approx 100 lines.
fc9b0554 432 (if (> size (* 100 80)) (+ (point) (/ size 10)))))
ac3f4c6f 433 (or (and buffer-file-name (vc-working-revision buffer-file-name))
5960adc7
DL
434 (save-restriction
435 (widen)
fc9b0554
SM
436 (let ((regexps change-log-version-number-regexp-list)
437 version)
5960adc7
DL
438 (while regexps
439 (save-excursion
440 (goto-char (point-min))
fc9b0554 441 (when (re-search-forward (pop regexps) limit t)
5960adc7 442 (setq version (match-string 1)
fc9b0554
SM
443 regexps nil))))
444 version)))))
776d8e16
GM
445
446
45a13f0d 447;;;###autoload
d68f7f1b 448(defun find-change-log (&optional file-name buffer-file)
45a13f0d 449 "Find a change log file for \\[add-change-log-entry] and return the name.
a82e2ed5
RS
450
451Optional arg FILE-NAME specifies the file to use.
de98fcaf 452If FILE-NAME is nil, use the value of `change-log-default-name'.
218cf475 453If `change-log-default-name' is nil, behave as though it were 'ChangeLog'
de98fcaf
RS
454\(or whatever we use on this operating system).
455
218cf475 456If `change-log-default-name' contains a leading directory component, then
513063cf 457simply find it in the current directory. Otherwise, search in the current
de98fcaf 458directory and its successive parents for a file so named.
45a13f0d
RM
459
460Once a file is found, `change-log-default-name' is set locally in the
d68f7f1b
SM
461current buffer to the complete file name.
462Optional arg BUFFER-FILE overrides `buffer-file-name'."
a82e2ed5
RS
463 ;; If user specified a file name or if this buffer knows which one to use,
464 ;; just use that.
45a13f0d 465 (or file-name
de98fcaf
RS
466 (setq file-name (and change-log-default-name
467 (file-name-directory change-log-default-name)
468 change-log-default-name))
a82e2ed5
RS
469 (progn
470 ;; Chase links in the source file
471 ;; and use the change log in the dir where it points.
d68f7f1b 472 (setq file-name (or (and (or buffer-file buffer-file-name)
a82e2ed5 473 (file-name-directory
d68f7f1b
SM
474 (file-chase-links
475 (or buffer-file buffer-file-name))))
a82e2ed5
RS
476 default-directory))
477 (if (file-directory-p file-name)
478 (setq file-name (expand-file-name (change-log-name) file-name)))
479 ;; Chase links before visiting the file.
480 ;; This makes it easier to use a single change log file
481 ;; for several related directories.
482 (setq file-name (file-chase-links file-name))
483 (setq file-name (expand-file-name file-name))
484 ;; Move up in the dir hierarchy till we find a change log file.
485 (let ((file1 file-name)
486 parent-dir)
487 (while (and (not (or (get-file-buffer file1) (file-exists-p file1)))
488 (progn (setq parent-dir
489 (file-name-directory
490 (directory-file-name
491 (file-name-directory file1))))
492 ;; Give up if we are already at the root dir.
493 (not (string= (file-name-directory file1)
494 parent-dir))))
495 ;; Move up to the parent dir and try again.
513063cf 496 (setq file1 (expand-file-name
a82e2ed5
RS
497 (file-name-nondirectory (change-log-name))
498 parent-dir)))
499 ;; If we found a change log in a parent, use that.
500 (if (or (get-file-buffer file1) (file-exists-p file1))
501 (setq file-name file1)))))
502 ;; Make a local variable in this buffer so we needn't search again.
503 (set (make-local-variable 'change-log-default-name) file-name)
504 file-name)
45a13f0d 505
2eb7ccf4
SM
506(defun add-log-file-name (buffer-file log-file)
507 ;; Never want to add a change log entry for the ChangeLog file itself.
508 (unless (or (null buffer-file) (string= buffer-file log-file))
d68f7f1b
SM
509 (if add-log-file-name-function
510 (funcall add-log-file-name-function buffer-file)
511 (setq buffer-file
e1f5b0ed 512 (file-relative-name buffer-file (file-name-directory log-file)))
d68f7f1b
SM
513 ;; If we have a backup file, it's presumably because we're
514 ;; comparing old and new versions (e.g. for deleted
515 ;; functions) and we'll want to use the original name.
516 (if (backup-file-name-p buffer-file)
517 (file-name-sans-versions buffer-file)
518 buffer-file))))
2eb7ccf4 519
84fc2cfa 520;;;###autoload
2a520399
DN
521(defun add-change-log-entry (&optional whoami file-name other-window new-entry
522 put-new-entry-on-new-line)
d882f144 523 "Find change log file, and add an entry for today and an item for this file.
83afd62c 524Optional arg WHOAMI (interactive prefix) non-nil means prompt for user
d9ee5172 525name and email (stored in `add-log-full-name' and `add-log-mailing-address').
83afd62c 526
d882f144
RS
527Second arg FILE-NAME is file name of the change log.
528If nil, use the value of `change-log-default-name'.
529
287d149f 530Third arg OTHER-WINDOW non-nil means visit in other window.
d882f144 531
287d149f 532Fourth arg NEW-ENTRY non-nil means always create a new entry at the front;
3697b807
DL
533never append to an existing entry. Option `add-log-keep-changes-together'
534otherwise affects whether a new entry is created.
535
2a520399
DN
536Fifth arg PUT-NEW-ENTRY-ON-NEW-LINE non-nil means that if a new
537entry is created, put it on a new line by itself, do not put it
538after a comma on an existing line.
539
598f34fa
SS
540Option `add-log-always-start-new-record' non-nil means always create a
541new record, even when the last record was made on the same date and by
542the same person.
543
d882f144
RS
544The change log file can start with a copyright notice and a copying
545permission notice. The first blank line indicates the end of these
546notices.
547
d1921057 548Today's date is calculated according to `add-log-time-zone-rule' if
3697b807 549non-nil, otherwise in local time."
84fc2cfa
ER
550 (interactive (list current-prefix-arg
551 (prompt-for-change-log-name)))
d68f7f1b
SM
552 (let* ((defun (add-log-current-defun))
553 (version (and change-log-version-info-enabled
554 (change-log-version-number-search)))
8f530b95
SM
555 (buf-file-name (if add-log-buffer-file-name-function
556 (funcall add-log-buffer-file-name-function)
557 buffer-file-name))
558 (buffer-file (if buf-file-name (expand-file-name buf-file-name)))
dd816e0d 559 (file-name (expand-file-name (find-change-log file-name buffer-file)))
d882f144 560 ;; Set ITEM to the file name to use in the new item.
ad4573c7 561 (item (add-log-file-name buffer-file file-name)))
2eb7ccf4 562
7cd017ba
SM
563 (unless (equal file-name buffer-file-name)
564 (if (or other-window (window-dedicated-p (selected-window)))
565 (find-file-other-window file-name)
566 (find-file file-name)))
bb042dc6 567 (or (derived-mode-p 'change-log-mode)
675a998f 568 (change-log-mode))
84fc2cfa
ER
569 (undo-boundary)
570 (goto-char (point-min))
d882f144 571
ad4573c7
SM
572 (let ((full-name (or add-log-full-name (user-full-name)))
573 (mailing-address (or add-log-mailing-address user-mail-address)))
574
575 (when whoami
1e899515 576 (setq full-name (read-string "Full name: " full-name))
ad4573c7
SM
577 ;; Note that some sites have room and phone number fields in
578 ;; full name which look silly when inserted. Rather than do
579 ;; anything about that here, let user give prefix argument so that
580 ;; s/he can edit the full name field in prompter if s/he wants.
581 (setq mailing-address
1e899515 582 (read-string "Mailing address: " mailing-address)))
ad4573c7
SM
583
584 ;; If file starts with a copyright and permission notice, skip them.
585 ;; Assume they end at first blank line.
586 (when (looking-at "Copyright")
587 (search-forward "\n\n")
588 (skip-chars-forward "\n"))
589
590 ;; Advance into first entry if it is usable; else make new one.
591 (let ((new-entries
592 (mapcar (lambda (addr)
593 (concat
594 (if (stringp add-log-time-zone-rule)
595 (let ((tz (getenv "TZ")))
596 (unwind-protect
597 (progn
598 (set-time-zone-rule add-log-time-zone-rule)
599 (funcall add-log-time-format))
600 (set-time-zone-rule tz)))
601 (funcall add-log-time-format))
602 " " full-name
603 " <" addr ">"))
604 (if (consp mailing-address)
605 mailing-address
606 (list mailing-address)))))
607 (if (and (not add-log-always-start-new-record)
608 (let ((hit nil))
609 (dolist (entry new-entries hit)
610 (when (looking-at (regexp-quote entry))
611 (setq hit t)))))
612 (forward-line 1)
613 (insert (nth (random (length new-entries))
614 new-entries)
615 (if use-hard-newlines hard-newline "\n")
616 (if use-hard-newlines hard-newline "\n"))
617 (forward-line -1))))
82f4acaf 618
d882f144
RS
619 ;; Determine where we should stop searching for a usable
620 ;; item to add to, within this entry.
ad4573c7
SM
621 (let ((bound
622 (save-excursion
623 (if (looking-at "\n*[^\n* \t]")
624 (skip-chars-forward "\n")
625 (if add-log-keep-changes-together
626 (forward-page) ; page delimits entries for date
627 (forward-paragraph))) ; paragraph delimits entries for file
628 (point))))
629
630 ;; Now insert the new line for this item.
631 (cond ((re-search-forward "^\\s *\\*\\s *$" bound t)
632 ;; Put this file name into the existing empty item.
633 (if item
634 (insert item)))
635 ((and (not new-entry)
636 (let (case-fold-search)
637 (re-search-forward
638 (concat (regexp-quote (concat "* " item))
639 ;; Don't accept `foo.bar' when
640 ;; looking for `foo':
641 "\\(\\s \\|[(),:]\\)")
642 bound t)))
643 ;; Add to the existing item for the same file.
644 (re-search-forward "^\\s *$\\|^\\s \\*")
645 (goto-char (match-beginning 0))
646 ;; Delete excess empty lines; make just 2.
647 (while (and (not (eobp)) (looking-at "^\\s *$"))
648 (delete-region (point) (line-beginning-position 2)))
649 (insert (if use-hard-newlines hard-newline "\n")
650 (if use-hard-newlines hard-newline "\n"))
651 (forward-line -2)
652 (indent-relative-maybe))
653 (t
654 ;; Make a new item.
655 (while (looking-at "\\sW")
656 (forward-line 1))
657 (while (and (not (eobp)) (looking-at "^\\s *$"))
658 (delete-region (point) (line-beginning-position 2)))
659 (insert (if use-hard-newlines hard-newline "\n")
660 (if use-hard-newlines hard-newline "\n")
661 (if use-hard-newlines hard-newline "\n"))
662 (forward-line -2)
663 (indent-to left-margin)
664 (insert "* ")
665 (if item (insert item)))))
1832dbd1 666 ;; Now insert the function name, if we have one.
d882f144 667 ;; Point is at the item for this file,
21d7e080 668 ;; either at the end of the line or at the first blank line.
5a9ac14b
SM
669 (if (not defun)
670 ;; No function name, so put in a colon unless we have just a star.
671 (unless (save-excursion
672 (beginning-of-line 1)
673 (looking-at "\\s *\\(\\*\\s *\\)?$"))
674 (insert ": ")
7b297602 675 (if version (insert version ?\s)))
5a9ac14b
SM
676 ;; Make it easy to get rid of the function name.
677 (undo-boundary)
5960adc7
DL
678 (unless (save-excursion
679 (beginning-of-line 1)
5a9ac14b 680 (looking-at "\\s *$"))
7b297602 681 (insert ?\s))
5a9ac14b
SM
682 ;; See if the prev function name has a message yet or not.
683 ;; If not, merge the two items.
684 (let ((pos (point-marker)))
685 (skip-syntax-backward " ")
686 (skip-chars-backward "):")
2a520399
DN
687 (if (and (not put-new-entry-on-new-line)
688 (looking-at "):")
fc9b0554
SM
689 (let ((pos (save-excursion (backward-sexp 1) (point))))
690 (when (equal (buffer-substring pos (point)) defun)
691 (delete-region pos (point)))
692 (> fill-column (+ (current-column) (length defun) 4))))
693 (progn (skip-chars-backward ", ")
694 (delete-region (point) pos)
695 (unless (memq (char-before) '(?\()) (insert ", ")))
2a520399
DN
696 (when (and (not put-new-entry-on-new-line) (looking-at "):"))
697 (delete-region (+ 1 (point)) (line-end-position)))
5a9ac14b
SM
698 (goto-char pos)
699 (insert "("))
700 (set-marker pos nil))
701 (insert defun "): ")
7b297602 702 (if version (insert version ?\s)))))
84fc2cfa 703
84fc2cfa
ER
704;;;###autoload
705(defun add-change-log-entry-other-window (&optional whoami file-name)
d882f144
RS
706 "Find change log file in other window and add entry and item.
707This is just like `add-change-log-entry' except that it displays
708the change log file in another window."
84fc2cfa
ER
709 (interactive (if current-prefix-arg
710 (list current-prefix-arg
711 (prompt-for-change-log-name))))
712 (add-change-log-entry whoami file-name t))
713
6dbf6147 714
d1921057 715(defvar change-log-indent-text 0)
fc9b0554 716
6dbf6147
MR
717(defun change-log-fill-parenthesized-list ()
718 ;; Fill parenthesized lists of names according to GNU standards.
719 ;; * file-name.ext (very-long-foo, very-long-bar, very-long-foobar):
720 ;; should be filled as
721 ;; * file-name.ext (very-long-foo, very-long-bar)
722 ;; (very-long-foobar):
723 (save-excursion
724 (end-of-line 0)
725 (skip-chars-backward " \t")
726 (when (and (equal (char-before) ?\,)
727 (> (point) (1+ (point-min))))
728 (condition-case nil
729 (when (save-excursion
730 (and (prog2
731 (up-list -1)
732 (equal (char-after) ?\()
733 (skip-chars-backward " \t"))
734 (or (bolp)
735 ;; Skip everything but a whitespace or asterisk.
736 (and (not (zerop (skip-chars-backward "^ \t\n*")))
737 (skip-chars-backward " \t")
738 ;; We want one asterisk here.
739 (= (skip-chars-backward "*") -1)
740 (skip-chars-backward " \t")
741 (bolp)))))
742 ;; Delete the comma.
743 (delete-char -1)
744 ;; Close list on previous line.
745 (insert ")")
746 (skip-chars-forward " \t\n")
747 ;; Start list on new line.
748 (insert-before-markers "("))
749 (error nil)))))
750
d1921057 751(defun change-log-indent ()
6dbf6147 752 (change-log-fill-parenthesized-list)
fc9b0554
SM
753 (let* ((indent
754 (save-excursion
755 (beginning-of-line)
756 (skip-chars-forward " \t")
757 (cond
d1921057 758 ((and (looking-at "\\(.*\\) [^ \n].*[^ \n] <.*>\\(?: +(.*)\\)? *$")
fc9b0554
SM
759 ;; Matching the output of add-log-time-format is difficult,
760 ;; but I'll get it has at least two adjacent digits.
761 (string-match "[[:digit:]][[:digit:]]" (match-string 1)))
762 0)
763 ((looking-at "[^*(]")
d1921057 764 (+ (current-left-margin) change-log-indent-text))
fc9b0554
SM
765 (t (current-left-margin)))))
766 (pos (save-excursion (indent-line-to indent) (point))))
767 (if (> pos (point)) (goto-char pos))))
768
769
3066d4ad 770(defvar smerge-resolve-function)
8bb4ed88 771(defvar copyright-at-end-flag)
3066d4ad 772
1da56800 773;;;###autoload
7cd017ba 774(define-derived-mode change-log-mode text-mode "Change Log"
eb8c3be9 775 "Major mode for editing change logs; like Indented Text Mode.
09b389d0 776Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74.
3697b807 777New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window].
5516387c 778Each entry behaves as a paragraph, and the entries for one day as a page.
3066d4ad
SM
779Runs `change-log-mode-hook'.
780\\{change-log-mode-map}"
7cd017ba 781 (setq left-margin 8
4f675a8c 782 fill-column 74
60f10a06 783 indent-tabs-mode t
ccf0d2ca
JB
784 tab-width 8
785 show-trailing-whitespace t)
60f10a06
KH
786 (set (make-local-variable 'fill-paragraph-function)
787 'change-log-fill-paragraph)
3ee9a09c
MR
788 ;; Avoid that filling leaves behind a single "*" on a line.
789 (add-hook 'fill-nobreak-predicate
790 '(lambda ()
8bb4ed88 791 (looking-back "^\\s *\\*\\s *" (line-beginning-position)))
3ee9a09c 792 nil t)
d1921057 793 (set (make-local-variable 'indent-line-function) 'change-log-indent)
fc9b0554 794 (set (make-local-variable 'tab-always-indent) nil)
8bb4ed88 795 (set (make-local-variable 'copyright-at-end-flag) t)
4b7d4d0d
DL
796 ;; We really do want "^" in paragraph-start below: it is only the
797 ;; lines that begin at column 0 (despite the left-margin of 8) that
798 ;; we are looking for. Adding `* ' allows eliding the blank line
799 ;; between entries for different files.
c9cfb0f2 800 (set (make-local-variable 'paragraph-start) "\\s *$\\|\f\\|^\\<")
4b7d4d0d 801 (set (make-local-variable 'paragraph-separate) paragraph-start)
2c91c85c
RS
802 ;; Match null string on the date-line so that the date-line
803 ;; is grouped with what follows.
964141f2 804 (set (make-local-variable 'page-delimiter) "^\\<\\|^\f")
dd309224 805 (set (make-local-variable 'version-control) 'never)
7cd017ba
SM
806 (set (make-local-variable 'smerge-resolve-function)
807 'change-log-resolve-conflict)
dd309224 808 (set (make-local-variable 'adaptive-fill-regexp) "\\s *")
4b286eca 809 (set (make-local-variable 'font-lock-defaults)
73b27641
JL
810 '(change-log-font-lock-keywords t nil nil backward-paragraph))
811 (set (make-local-variable 'isearch-buffers-next-buffer-function)
812 'change-log-next-buffer)
0bde6a03
DN
813 (set (make-local-variable 'beginning-of-defun-function)
814 'change-log-beginning-of-defun)
815 (set (make-local-variable 'end-of-defun-function)
816 'change-log-end-of-defun)
73b27641
JL
817 (isearch-buffers-minor-mode))
818
819(defun change-log-next-buffer (&optional buffer wrap)
820 "Return the next buffer in the series of ChangeLog file buffers.
821This function is used for multiple buffers isearch.
822A sequence of buffers is formed by ChangeLog files with decreasing
823numeric file name suffixes in the directory of the initial ChangeLog
824file were isearch was started."
825 (let* ((name (change-log-name))
826 (files (cons name (sort (file-expand-wildcards
827 (concat name "[-.][0-9]*"))
828 (lambda (a b)
bac2f6bc
SM
829 ;; The file's extension may not have a valid
830 ;; version form (e.g. VC backup revisions).
831 (ignore-errors
832 (version< (substring b (length name))
833 (substring a (length name))))))))
73b27641
JL
834 (files (if isearch-forward files (reverse files))))
835 (find-file-noselect
836 (if wrap
837 (car files)
838 (cadr (member (file-name-nondirectory (buffer-file-name buffer))
839 files))))))
21d7e080 840
287d149f
RM
841;; It might be nice to have a general feature to replace this. The idea I
842;; have is a variable giving a regexp matching text which should not be
843;; moved from bol by filling. change-log-mode would set this to "^\\s *\\s(".
844;; But I don't feel up to implementing that today.
845(defun change-log-fill-paragraph (&optional justify)
846 "Fill the paragraph, but preserve open parentheses at beginning of lines.
847Prefix arg means justify as well."
848 (interactive "P")
8d6467a4
RS
849 (let ((end (progn (forward-paragraph) (point)))
850 (beg (progn (backward-paragraph) (point)))
6dbf6147
MR
851 ;; Add lines starting with whitespace followed by a left paren or an
852 ;; asterisk.
853 (paragraph-start (concat paragraph-start "\\|\\s *\\(?:\\s(\\|\\*\\)"))
854 ;; Make sure we call `change-log-indent'.
855 (fill-indent-according-to-mode t))
8d6467a4
RS
856 (fill-region beg end justify)
857 t))
287d149f 858\f
fcad5199 859(defcustom add-log-current-defun-header-regexp
a8d693d8 860 "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"
d1921057 861 "Heuristic regexp used by `add-log-current-defun' for unknown major modes."
fcad5199
RS
862 :type 'regexp
863 :group 'change-log)
21d7e080 864
fb644f48
EN
865;;;###autoload
866(defvar add-log-lisp-like-modes
d1921057 867 '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)
fb644f48
EN
868 "*Modes that look like Lisp to `add-log-current-defun'.")
869
870;;;###autoload
871(defvar add-log-c-like-modes
d1921057 872 '(c-mode c++-mode c++-c-mode objc-mode)
fb644f48
EN
873 "*Modes that look like C to `add-log-current-defun'.")
874
875;;;###autoload
876(defvar add-log-tex-like-modes
bb042dc6 877 '(TeX-mode plain-TeX-mode LaTeX-mode tex-mode)
fb644f48
EN
878 "*Modes that look like TeX to `add-log-current-defun'.")
879
ab319633
GM
880(declare-function c-cpp-define-name "cc-cmds" ())
881(declare-function c-defun-name "cc-cmds" ())
004a00f4 882
e332f80b 883;;;###autoload
21d7e080
ER
884(defun add-log-current-defun ()
885 "Return name of function definition point is in, or nil.
886
63314951 887Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...),
5960adc7 888Texinfo (@node titles) and Perl.
21d7e080
ER
889
890Other modes are handled by a heuristic that looks in the 10K before
891point for uppercase headings starting in the first column or
5960adc7 892identifiers followed by `:' or `='. See variables
c1356086 893`add-log-current-defun-header-regexp' and
5ef08021 894`add-log-current-defun-function'.
21d7e080
ER
895
896Has a preference of looking backwards."
2cc0b765
RS
897 (condition-case nil
898 (save-excursion
899 (let ((location (point)))
5960adc7
DL
900 (cond (add-log-current-defun-function
901 (funcall add-log-current-defun-function))
bb042dc6 902 ((apply 'derived-mode-p add-log-lisp-like-modes)
a0151877 903 ;; If we are now precisely at the beginning of a defun,
2cc0b765
RS
904 ;; make sure beginning-of-defun finds that one
905 ;; rather than the previous one.
906 (or (eobp) (forward-char 1))
907 (beginning-of-defun)
5960adc7
DL
908 ;; Make sure we are really inside the defun found,
909 ;; not after it.
42b1fc29
RS
910 (when (and (looking-at "\\s(")
911 (progn (end-of-defun)
912 (< location (point)))
913 (progn (forward-sexp -1)
914 (>= location (point))))
915 (if (looking-at "\\s(")
916 (forward-char 1))
917 ;; Skip the defining construct name, typically "defun"
918 ;; or "defvar".
919 (forward-sexp 1)
920 ;; The second element is usually a symbol being defined.
921 ;; If it is not, use the first symbol in it.
63c7727f 922 (skip-chars-forward " \t\n'(")
5960adc7
DL
923 (buffer-substring-no-properties (point)
924 (progn (forward-sexp 1)
925 (point)))))
bb042dc6 926 ((apply 'derived-mode-p add-log-c-like-modes)
221fcdaa
AM
927 (or (c-cpp-define-name)
928 (c-defun-name)))
929 ((memq major-mode add-log-tex-like-modes)
2cc0b765 930 (if (re-search-backward
5960adc7
DL
931 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)"
932 nil t)
2cc0b765
RS
933 (progn
934 (goto-char (match-beginning 0))
5960adc7
DL
935 (buffer-substring-no-properties
936 (1+ (point)) ; without initial backslash
937 (line-end-position)))))
bb042dc6 938 ((derived-mode-p 'texinfo-mode)
3071ee28 939 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t)
5960adc7 940 (match-string-no-properties 1)))
fb1b68a4 941 ((derived-mode-p 'perl-mode 'cperl-mode)
5a9ac14b 942 (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t)
5960adc7
DL
943 (match-string-no-properties 1)))
944 ;; Emacs's autoconf-mode installs its own
945 ;; `add-log-current-defun-function'. This applies to
946 ;; a different mode apparently for editing .m4
947 ;; autoconf source.
bb042dc6 948 ((derived-mode-p 'autoconf-mode)
5960adc7
DL
949 (if (re-search-backward
950 "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t)
951 (match-string-no-properties 3)))
2cc0b765
RS
952 (t
953 ;; If all else fails, try heuristics
c1356086
GM
954 (let (case-fold-search
955 result)
2cc0b765 956 (end-of-line)
c1356086
GM
957 (when (re-search-backward
958 add-log-current-defun-header-regexp
959 (- (point) 10000)
960 t)
5960adc7
DL
961 (setq result (or (match-string-no-properties 1)
962 (match-string-no-properties 0)))
c1356086
GM
963 ;; Strip whitespace away
964 (when (string-match "\\([^ \t\n\r\f].*[^ \t\n\r\f]\\)"
965 result)
5960adc7 966 (setq result (match-string-no-properties 1 result)))
c1356086 967 result))))))
2cc0b765 968 (error nil)))
ef15f270 969
83afd62c 970(defvar change-log-get-method-definition-md)
15319a8f 971
83afd62c 972;; Subroutine used within change-log-get-method-definition.
59c1a7de
RS
973;; Add the last match in the buffer to the end of `md',
974;; followed by the string END; move to the end of that match.
83afd62c
KH
975(defun change-log-get-method-definition-1 (end)
976 (setq change-log-get-method-definition-md
977 (concat change-log-get-method-definition-md
5960adc7 978 (match-string 1)
15319a8f 979 end))
59c1a7de
RS
980 (goto-char (match-end 0)))
981
83afd62c 982(defun change-log-get-method-definition ()
eba72fc1 983"For Objective C, return the method name if we are in a method."
83afd62c 984 (let ((change-log-get-method-definition-md "["))
59c1a7de 985 (save-excursion
f27f16ed 986 (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t)
83afd62c 987 (change-log-get-method-definition-1 " ")))
59c1a7de
RS
988 (save-excursion
989 (cond
f27f16ed 990 ((re-search-forward "^\\([-+]\\)[ \t\n\f\r]*\\(([^)]*)\\)?\\s-*" nil t)
83afd62c 991 (change-log-get-method-definition-1 "")
59c1a7de
RS
992 (while (not (looking-at "[{;]"))
993 (looking-at
f27f16ed 994 "\\([A-Za-z_]*:?\\)\\s-*\\(([^)]*)\\)?[A-Za-z_]*[ \t\n\f\r]*")
83afd62c
KH
995 (change-log-get-method-definition-1 ""))
996 (concat change-log-get-method-definition-md "]"))))))
075a6629
DL
997\f
998(defun change-log-sortable-date-at ()
999 "Return date of log entry in a consistent form for sorting.
1000Point is assumed to be at the start of the entry."
1001 (require 'timezone)
0bde6a03 1002 (if (looking-at change-log-start-entry-re)
075a6629
DL
1003 (let ((date (match-string-no-properties 0)))
1004 (if date
1005 (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date)
1006 (concat (match-string 1 date) (match-string 2 date)
1007 (match-string 3 date))
1008 (condition-case nil
1009 (timezone-make-date-sortable date)
1010 (error nil)))))
1011 (error "Bad date")))
59c1a7de 1012
7cd017ba
SM
1013(defun change-log-resolve-conflict ()
1014 "Function to be used in `smerge-resolve-function'."
74dea9e1
SM
1015 (save-excursion
1016 (save-restriction
1017 (narrow-to-region (match-beginning 0) (match-end 0))
1018 (let ((mb1 (match-beginning 1))
1019 (me1 (match-end 1))
1020 (mb3 (match-beginning 3))
1021 (me3 (match-end 3))
1022 (tmp1 (generate-new-buffer " *changelog-resolve-1*"))
1023 (tmp2 (generate-new-buffer " *changelog-resolve-2*")))
1024 (unwind-protect
1025 (let ((buf (current-buffer)))
1026 (with-current-buffer tmp1
1027 (change-log-mode)
1028 (insert-buffer-substring buf mb1 me1))
1029 (with-current-buffer tmp2
1030 (change-log-mode)
1031 (insert-buffer-substring buf mb3 me3)
1032 ;; Do the merge here instead of inside `buf' so as to be
1033 ;; more robust in case change-log-merge fails.
1034 (change-log-merge tmp1))
1035 (goto-char (point-max))
1036 (delete-region (point-min)
1037 (prog1 (point)
1038 (insert-buffer-substring tmp2))))
1039 (kill-buffer tmp1)
1040 (kill-buffer tmp2))))))
7cd017ba 1041
075a6629
DL
1042;;;###autoload
1043(defun change-log-merge (other-log)
eba72fc1 1044 "Merge the contents of change log file OTHER-LOG with this buffer.
075a6629 1045Both must be found in Change Log mode (since the merging depends on
7cd017ba
SM
1046the appropriate motion commands). OTHER-LOG can be either a file name
1047or a buffer.
075a6629 1048
918f4ac3
DL
1049Entries are inserted in chronological order. Both the current and
1050old-style time formats for entries are supported."
075a6629 1051 (interactive "*fLog file name to merge: ")
bb042dc6 1052 (if (not (derived-mode-p 'change-log-mode))
075a6629 1053 (error "Not in Change Log mode"))
7cd017ba
SM
1054 (let ((other-buf (if (bufferp other-log) other-log
1055 (find-file-noselect other-log)))
075a6629
DL
1056 (buf (current-buffer))
1057 date1 start end)
1058 (save-excursion
1059 (goto-char (point-min))
1060 (set-buffer other-buf)
1061 (goto-char (point-min))
bb042dc6 1062 (if (not (derived-mode-p 'change-log-mode))
075a6629
DL
1063 (error "%s not found in Change Log mode" other-log))
1064 ;; Loop through all the entries in OTHER-LOG.
1065 (while (not (eobp))
1066 (setq date1 (change-log-sortable-date-at))
1067 (setq start (point)
1068 end (progn (forward-page) (point)))
1069 ;; Look for an entry in original buffer that isn't later.
1070 (with-current-buffer buf
1071 (while (and (not (eobp))
1072 (string< date1 (change-log-sortable-date-at)))
1073 (forward-page))
1074 (if (not (eobp))
1075 (insert-buffer-substring other-buf start end)
1076 ;; At the end of the original buffer, insert a newline to
1077 ;; separate entries and then the rest of the file being
7cd017ba
SM
1078 ;; merged.
1079 (unless (or (bobp)
1080 (and (= ?\n (char-before))
1081 (or (<= (1- (point)) (point-min))
1082 (= ?\n (char-before (1- (point)))))))
97f4e87c 1083 (insert (if use-hard-newlines hard-newline "\n")))
7cd017ba
SM
1084 ;; Move to the end of it to terminate outer loop.
1085 (with-current-buffer other-buf
1086 (goto-char (point-max)))
1087 (insert-buffer-substring other-buf start)))))))
ef15f270 1088
0bde6a03
DN
1089(defun change-log-beginning-of-defun ()
1090 (re-search-backward change-log-start-entry-re nil 'move))
1091
1092(defun change-log-end-of-defun ()
1093 ;; Look back and if there is no entry there it means we are before
1094 ;; the first ChangeLog entry, so go forward until finding one.
1095 (unless (save-excursion (re-search-backward change-log-start-entry-re nil t))
1096 (re-search-forward change-log-start-entry-re nil t))
1097
1098 ;; In case we are at the end of log entry going forward a line will
1099 ;; make us find the next entry when searching. If we are inside of
1100 ;; an entry going forward a line will still keep the point inside
1101 ;; the same entry.
1102 (forward-line 1)
1103
1104 ;; In case we are at the beginning of an entry, move past it.
1105 (when (looking-at change-log-start-entry-re)
1106 (goto-char (match-end 0))
1107 (forward-line 1))
1108
1109 ;; Search for the start of the next log entry. Go to the end of the
1110 ;; buffer if we could not find a next entry.
1111 (when (re-search-forward change-log-start-entry-re nil 'move)
1112 (goto-char (match-beginning 0))
1113 (forward-line -1)))
1114
1da56800
RS
1115(provide 'add-log)
1116
d1921057 1117;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762
fd7fa35a 1118;;; add-log.el ends here