1 ;;; add-log.el --- change log maintenance commands for Emacs
3 ;; Copyright (C) 1985, 86, 88, 93, 94, 97, 98, 2000 Free Software Foundation, Inc.
8 ;; This file is part of GNU Emacs.
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option)
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 ;; Boston, MA 02111-1307, USA.
27 ;; This facility is documented in the Emacs Manual.
34 (defgroup change-log nil
35 "Change log maintenance"
37 :link
'(custom-manual "(emacs)Change Log")
42 (defcustom change-log-default-name nil
43 "*Name of a change log file for \\[add-change-log-entry]."
44 :type
'(choice (const :tag
"default" nil
)
48 (defcustom change-log-mode-hook nil
49 "Normal hook run by `change-log-mode'."
53 (defcustom add-log-current-defun-function nil
54 "*If non-nil, function to guess name of surrounding function.
55 It is used by `add-log-current-defun' in preference to built-in rules.
56 Returns function's name as a string, or nil if outside a function."
57 :type
'(choice (const nil
) function
)
61 (defcustom add-log-full-name nil
62 "*Full name of user, for inclusion in ChangeLog daily headers.
63 This defaults to the value returned by the function `user-full-name'."
64 :type
'(choice (const :tag
"Default" nil
)
69 (defcustom add-log-mailing-address nil
70 "*Electronic mail addresses of user, for inclusion in ChangeLog headers.
71 This defaults to the value of `user-mail-address'. In addition to
72 being a simple string, this value can also be a list. All elements
73 will be recognized as referring to the same user; when creating a new
74 ChangeLog entry, one element will be chosen at random."
75 :type
'(choice (const :tag
"Default" nil
)
76 (string :tag
"String")
77 (repeat :tag
"List of Strings" string
))
80 (defcustom add-log-time-format
'add-log-iso8601-time-string
81 "*Function that defines the time format.
82 For example, `add-log-iso8601-time-string', which gives the
83 date in international ISO 8601 format,
84 and `current-time-string' are two valid values."
85 :type
'(radio (const :tag
"International ISO 8601 format"
86 add-log-iso8601-time-string
)
87 (const :tag
"Old format, as returned by `current-time-string'"
89 (function :tag
"Other"))
92 (defcustom add-log-keep-changes-together nil
93 "*If non-nil, normally keep day's log entries for one file together.
95 Log entries for a given file made with \\[add-change-log-entry] or
96 \\[add-change-log-entry-other-window] will only be added to others \
98 today if this variable is non-nil or that file comes first in today's
99 entries. Otherwise another entry for that file will be started. An
103 * bar (...): change 1
105 in the latter case, \\[add-change-log-entry-other-window] in a \
106 buffer visiting `bar', yields:
110 * bar (...): change 1
115 * bar (...): change 1
118 The NEW-ENTRY arg to `add-change-log-entry' can override the effect of
124 (defcustom add-log-always-start-new-record nil
125 "*If non-nil, `add-change-log-entry' will always start a new record."
130 (defcustom add-log-buffer-file-name-function nil
131 "*If non-nil, function to call to identify the full filename of a buffer.
132 This function is called with no argument. If this is nil, the default is to
133 use `buffer-file-name'."
134 :type
'(choice (const nil
) function
)
137 (defcustom add-log-file-name-function nil
138 "*If non-nil, function to call to identify the filename for a ChangeLog entry.
139 This function is called with one argument, the value of variable
140 `buffer-file-name' in that buffer. If this is nil, the default is to
141 use the file's name relative to the directory of the change log file."
142 :type
'(choice (const nil
) function
)
146 (defcustom change-log-version-info-enabled nil
147 "*If non-nil, enable recording version numbers with the changes."
152 (defcustom change-log-version-number-regexp-list
153 (let ((re "\\([0-9]+\.[0-9.]+\\)"))
155 ;; (defconst ad-version "2.15"
156 (concat "^(def[^ \t\n]+[ \t]+[^ \t\n][ \t]\"" re
)
157 ;; Revision: pcl-cvs.el,v 1.72 1999/09/05 20:21:54 monnier Exp
158 (concat "^;+ *Revision: +[^ \t\n]+[ \t]+" re
)))
159 "*List of regexps to search for version number.
160 The version number must be in group 1.
161 Note: The search is conducted only within 10%, at the beginning of the file."
163 :type
'(repeat regexp
)
166 (defface change-log-date-face
167 '((t (:inherit font-lock-string-face
)))
168 "Face used to highlight dates in date lines."
172 (defface change-log-name-face
173 '((t (:inherit font-lock-constant-face
)))
174 "Face for highlighting author names."
178 (defface change-log-email-face
179 '((t (:inherit font-lock-variable-name-face
)))
180 "Face for highlighting author email addresses."
184 (defface change-log-file-face
185 '((t (:inherit font-lock-function-name-face
)))
186 "Face for highlighting file names."
190 (defface change-log-list-face
191 '((t (:inherit font-lock-keyword-face
)))
192 "Face for highlighting parenthesized lists of functions or variables."
196 (defface change-log-conditionals-face
197 '((t (:inherit font-lock-variable-name-face
)))
198 "Face for highlighting conditionals of the form `[...]'."
202 (defface change-log-function-face
203 '((t (:inherit font-lock-variable-name-face
)))
204 "Face for highlighting items of the form `<....>'."
208 (defface change-log-acknowledgement-face
209 '((t (:inherit font-lock-comment-face
)))
210 "Face for highlighting acknowledgments."
214 (defvar change-log-font-lock-keywords
216 ;; Date lines, new and old styles.
217 ("^\\sw.........[0-9:+ ]*"
218 (0 'change-log-date-face
)
219 ;; Name and e-mail; some people put e-mail in parens, not angles.
220 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
221 (1 'change-log-name-face
)
222 (2 'change-log-email-face
)))
225 ("^\t\\* \\([^ ,:([\n]+\\)"
226 (1 'change-log-file-face
)
227 ;; Possibly further names in a list:
228 ("\\=, \\([^ ,:([\n]+\\)" nil nil
(1 'change-log-file-face
))
229 ;; Possibly a parenthesized list of names:
230 ("\\= (\\([^) ,:\n]+\\)" nil nil
(1 'change-log-list-face
))
231 ("\\=, *\\([^) ,:\n]+\\)" nil nil
(1 'change-log-list-face
)))
233 ;; Function or variable names.
234 ("^\t(\\([^) ,:\n]+\\)"
235 (1 'change-log-list-face
)
236 ("\\=, *\\([^) ,:\n]+\\)" nil nil
(1 'change-log-list-face
)))
239 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals-face
))
241 ;; Function of change.
242 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face
))
245 ("\\(^\t\\| \\)\\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
246 2 'change-log-acknowledgement-face
))
247 "Additional expressions to highlight in Change Log mode.")
249 (defvar change-log-mode-map
(make-sparse-keymap)
250 "Keymap for Change Log major mode.")
252 (defvar change-log-time-zone-rule nil
253 "Time zone used for calculating change log time stamps.
254 It takes the same format as the TZ argument of `set-time-zone-rule'.
255 If nil, use local time.")
257 (defun add-log-iso8601-time-zone (time)
258 (let* ((utc-offset (or (car (current-time-zone time
)) 0))
259 (sign (if (< utc-offset
0) ?- ?
+))
260 (sec (abs utc-offset
))
265 (format (cond ((not (zerop ss
)) "%c%02d:%02d:%02d")
266 ((not (zerop mm
)) "%c%02d:%02d")
270 (defun add-log-iso8601-time-string ()
271 (if change-log-time-zone-rule
272 (let ((tz (getenv "TZ"))
273 (now (current-time)))
276 (set-time-zone-rule change-log-time-zone-rule
)
278 (format-time-string "%Y-%m-%d " now
)
279 (add-log-iso8601-time-zone now
)))
280 (set-time-zone-rule tz
)))
281 (format-time-string "%Y-%m-%d")))
283 (defun change-log-name ()
284 "Return (system-dependent) default name for a change log file."
285 (or change-log-default-name
286 (if (eq system-type
'vax-vms
)
291 (defun prompt-for-change-log-name ()
292 "Prompt for a change log name."
293 (let* ((default (change-log-name))
294 (name (expand-file-name
295 (read-file-name (format "Log file (default %s): " default
)
297 ;; Handle something that is syntactically a directory name.
298 ;; Look for ChangeLog or whatever in that directory.
299 (if (string= (file-name-nondirectory name
) "")
300 (expand-file-name (file-name-nondirectory default
)
302 ;; Handle specifying a file that is a directory.
303 (if (file-directory-p name
)
304 (expand-file-name (file-name-nondirectory default
)
305 (file-name-as-directory name
))
308 (defun change-log-version-number-search ()
309 "Return version number of current buffer's file.
310 This is the value returned by `vc-workfile-version' or, if that is
311 nil, by matching `change-log-version-number-regexp-list'."
312 (let* ((size (buffer-size))
314 ;; The version number can be anywhere in the file, but
315 ;; restrict search to the file beginning: 10% should be
316 ;; enough to prevent some mishits.
318 ;; Apply percentage only if buffer size is bigger than
320 (if (> size
(* 100 80))
324 (or (and buffer-file-name
(vc-workfile-version buffer-file-name
))
327 (let ((regexps change-log-version-number-regexp-list
))
330 (goto-char (point-min))
331 (when (re-search-forward (pop regexps
) end t
)
332 (setq version
(match-string 1)
337 (defun find-change-log (&optional file-name buffer-file
)
338 "Find a change log file for \\[add-change-log-entry] and return the name.
340 Optional arg FILE-NAME specifies the file to use.
341 If FILE-NAME is nil, use the value of `change-log-default-name'.
342 If 'change-log-default-name' is nil, behave as though it were 'ChangeLog'
343 \(or whatever we use on this operating system).
345 If 'change-log-default-name' contains a leading directory component, then
346 simply find it in the current directory. Otherwise, search in the current
347 directory and its successive parents for a file so named.
349 Once a file is found, `change-log-default-name' is set locally in the
350 current buffer to the complete file name.
351 Optional arg BUFFER-FILE overrides `buffer-file-name'."
352 ;; If user specified a file name or if this buffer knows which one to use,
355 (setq file-name
(and change-log-default-name
356 (file-name-directory change-log-default-name
)
357 change-log-default-name
))
359 ;; Chase links in the source file
360 ;; and use the change log in the dir where it points.
361 (setq file-name
(or (and (or buffer-file buffer-file-name
)
364 (or buffer-file buffer-file-name
))))
366 (if (file-directory-p file-name
)
367 (setq file-name
(expand-file-name (change-log-name) file-name
)))
368 ;; Chase links before visiting the file.
369 ;; This makes it easier to use a single change log file
370 ;; for several related directories.
371 (setq file-name
(file-chase-links file-name
))
372 (setq file-name
(expand-file-name file-name
))
373 ;; Move up in the dir hierarchy till we find a change log file.
374 (let ((file1 file-name
)
376 (while (and (not (or (get-file-buffer file1
) (file-exists-p file1
)))
377 (progn (setq parent-dir
380 (file-name-directory file1
))))
381 ;; Give up if we are already at the root dir.
382 (not (string= (file-name-directory file1
)
384 ;; Move up to the parent dir and try again.
385 (setq file1
(expand-file-name
386 (file-name-nondirectory (change-log-name))
388 ;; If we found a change log in a parent, use that.
389 (if (or (get-file-buffer file1
) (file-exists-p file1
))
390 (setq file-name file1
)))))
391 ;; Make a local variable in this buffer so we needn't search again.
392 (set (make-local-variable 'change-log-default-name
) file-name
)
395 (defun add-log-file-name (buffer-file log-file
)
396 ;; Never want to add a change log entry for the ChangeLog file itself.
397 (unless (or (null buffer-file
) (string= buffer-file log-file
))
398 (if add-log-file-name-function
399 (funcall add-log-file-name-function buffer-file
)
402 (concat "^" (regexp-quote (file-name-directory log-file
)))
404 (substring buffer-file
(match-end 0))
405 (file-name-nondirectory buffer-file
)))
406 ;; If we have a backup file, it's presumably because we're
407 ;; comparing old and new versions (e.g. for deleted
408 ;; functions) and we'll want to use the original name.
409 (if (backup-file-name-p buffer-file
)
410 (file-name-sans-versions buffer-file
)
414 (defun add-change-log-entry (&optional whoami file-name other-window new-entry
)
415 "Find change log file, and add an entry for today and an item for this file.
416 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user
419 Second arg FILE-NAME is file name of the change log.
420 If nil, use the value of `change-log-default-name'.
422 Third arg OTHER-WINDOW non-nil means visit in other window.
424 Fourth arg NEW-ENTRY non-nil means always create a new entry at the front;
425 never append to an existing entry. Option `add-log-keep-changes-together'
426 otherwise affects whether a new entry is created.
428 Option `add-log-always-start-new-record' non-nil means always create a
429 new record, even when the last record was made on the same date and by
432 The change log file can start with a copyright notice and a copying
433 permission notice. The first blank line indicates the end of these
436 Today's date is calculated according to `change-log-time-zone-rule' if
437 non-nil, otherwise in local time."
438 (interactive (list current-prefix-arg
439 (prompt-for-change-log-name)))
440 (or add-log-full-name
441 (setq add-log-full-name
(user-full-name)))
442 (or add-log-mailing-address
443 (setq add-log-mailing-address user-mail-address
))
446 (setq add-log-full-name
(read-input "Full name: " add-log-full-name
))
447 ;; Note that some sites have room and phone number fields in
448 ;; full name which look silly when inserted. Rather than do
449 ;; anything about that here, let user give prefix argument so that
450 ;; s/he can edit the full name field in prompter if s/he wants.
451 (setq add-log-mailing-address
452 (read-input "Mailing address: " add-log-mailing-address
))))
454 (let* ((defun (add-log-current-defun))
455 (version (and change-log-version-info-enabled
456 (change-log-version-number-search)))
457 (buf-file-name (if add-log-buffer-file-name-function
458 (funcall add-log-buffer-file-name-function
)
460 (buffer-file (if buf-file-name
(expand-file-name buf-file-name
)))
461 (file-name (expand-file-name
462 (or file-name
(find-change-log file-name buffer-file
))))
463 ;; Set ITEM to the file name to use in the new item.
464 (item (add-log-file-name buffer-file file-name
))
467 (unless (equal file-name buffer-file-name
)
468 (if (or other-window
(window-dedicated-p (selected-window)))
469 (find-file-other-window file-name
)
470 (find-file file-name
)))
471 (or (eq major-mode
'change-log-mode
)
474 (goto-char (point-min))
476 ;; If file starts with a copyright and permission notice, skip them.
477 ;; Assume they end at first blank line.
478 (when (looking-at "Copyright")
479 (search-forward "\n\n")
480 (skip-chars-forward "\n"))
482 ;; Advance into first entry if it is usable; else make new one.
483 (let ((new-entries (mapcar (lambda (addr)
484 (concat (funcall add-log-time-format
)
485 " " add-log-full-name
487 (if (consp add-log-mailing-address
)
488 add-log-mailing-address
489 (list add-log-mailing-address
)))))
490 (if (and (not add-log-always-start-new-record
)
492 (dolist (entry new-entries hit
)
493 (when (looking-at (regexp-quote entry
))
496 (insert (nth (random (length new-entries
))
501 ;; Determine where we should stop searching for a usable
502 ;; item to add to, within this entry.
505 (if (looking-at "\n*[^\n* \t]")
506 (skip-chars-forward "\n")
507 (if add-log-keep-changes-together
508 (forward-page) ; page delimits entries for date
509 (forward-paragraph))) ; paragraph delimits entries for file
512 ;; Now insert the new line for this item.
513 (cond ((re-search-forward "^\\s *\\*\\s *$" bound t
)
514 ;; Put this file name into the existing empty item.
517 ((and (not new-entry
)
518 (let (case-fold-search)
520 (concat (regexp-quote (concat "* " item
))
521 ;; Don't accept `foo.bar' when
522 ;; looking for `foo':
523 "\\(\\s \\|[(),:]\\)")
525 ;; Add to the existing item for the same file.
526 (re-search-forward "^\\s *$\\|^\\s \\*")
527 (goto-char (match-beginning 0))
528 ;; Delete excess empty lines; make just 2.
529 (while (and (not (eobp)) (looking-at "^\\s *$"))
530 (delete-region (point) (line-beginning-position 2)))
533 (indent-relative-maybe))
536 (while (looking-at "\\sW")
538 (while (and (not (eobp)) (looking-at "^\\s *$"))
539 (delete-region (point) (line-beginning-position 2)))
542 (indent-to left-margin
)
544 (if item
(insert item
))))
545 ;; Now insert the function name, if we have one.
546 ;; Point is at the item for this file,
547 ;; either at the end of the line or at the first blank line.
549 ;; No function name, so put in a colon unless we have just a star.
550 (unless (save-excursion
551 (beginning-of-line 1)
552 (looking-at "\\s *\\(\\*\\s *\\)?$"))
554 (if version
(insert version ?\
)))
555 ;; Make it easy to get rid of the function name.
557 (unless (save-excursion
558 (beginning-of-line 1)
559 (looking-at "\\s *$"))
561 ;; See if the prev function name has a message yet or not.
562 ;; If not, merge the two items.
563 (let ((pos (point-marker)))
564 (skip-syntax-backward " ")
565 (skip-chars-backward "):")
566 (if (and (looking-at "):")
567 (> fill-column
(+ (current-column) (length defun
) 4)))
568 (progn (delete-region (point) pos
) (insert ", "))
569 (if (looking-at "):")
570 (delete-region (+ 1 (point)) (line-end-position)))
573 (set-marker pos nil
))
575 (if version
(insert version ?\
)))))
578 (defun add-change-log-entry-other-window (&optional whoami file-name
)
579 "Find change log file in other window and add entry and item.
580 This is just like `add-change-log-entry' except that it displays
581 the change log file in another window."
582 (interactive (if current-prefix-arg
583 (list current-prefix-arg
584 (prompt-for-change-log-name))))
585 (add-change-log-entry whoami file-name t
))
586 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
589 (define-derived-mode change-log-mode text-mode
"Change Log"
590 "Major mode for editing change logs; like Indented Text Mode.
591 Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74.
592 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window].
593 Each entry behaves as a paragraph, and the entries for one day as a page.
594 Runs `change-log-mode-hook'."
599 (set (make-local-variable 'fill-paragraph-function
)
600 'change-log-fill-paragraph
)
601 (set (make-local-variable 'indent-line-function
) 'indent-to-left-margin
)
602 ;; We really do want "^" in paragraph-start below: it is only the
603 ;; lines that begin at column 0 (despite the left-margin of 8) that
604 ;; we are looking for. Adding `* ' allows eliding the blank line
605 ;; between entries for different files.
606 (set (make-local-variable 'paragraph-start
) "\\s *$\\|\f\\|^\\<")
607 (set (make-local-variable 'paragraph-separate
) paragraph-start
)
608 ;; Match null string on the date-line so that the date-line
609 ;; is grouped with what follows.
610 (set (make-local-variable 'page-delimiter
) "^\\<\\|^\f")
611 (set (make-local-variable 'version-control
) 'never
)
612 (set (make-local-variable 'smerge-resolve-function
)
613 'change-log-resolve-conflict
)
614 (set (make-local-variable 'adaptive-fill-regexp
) "\\s *")
615 (set (make-local-variable 'font-lock-defaults
)
616 '(change-log-font-lock-keywords t nil nil backward-paragraph
)))
618 ;; It might be nice to have a general feature to replace this. The idea I
619 ;; have is a variable giving a regexp matching text which should not be
620 ;; moved from bol by filling. change-log-mode would set this to "^\\s *\\s(".
621 ;; But I don't feel up to implementing that today.
622 (defun change-log-fill-paragraph (&optional justify
)
623 "Fill the paragraph, but preserve open parentheses at beginning of lines.
624 Prefix arg means justify as well."
626 (let ((end (progn (forward-paragraph) (point)))
627 (beg (progn (backward-paragraph) (point)))
628 (paragraph-start (concat paragraph-start
"\\|\\s *\\s(")))
629 (fill-region beg end justify
)
632 (defcustom add-log-current-defun-header-regexp
633 "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"
634 "*Heuristic regexp used by `add-log-current-defun' for unknown major modes."
639 (defvar add-log-lisp-like-modes
640 '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode
)
641 "*Modes that look like Lisp to `add-log-current-defun'.")
644 (defvar add-log-c-like-modes
645 '(c-mode c
++-mode c
++-c-mode objc-mode
)
646 "*Modes that look like C to `add-log-current-defun'.")
649 (defvar add-log-tex-like-modes
650 '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode
)
651 "*Modes that look like TeX to `add-log-current-defun'.")
654 (defun add-log-current-defun ()
655 "Return name of function definition point is in, or nil.
657 Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...),
658 Texinfo (@node titles) and Perl.
660 Other modes are handled by a heuristic that looks in the 10K before
661 point for uppercase headings starting in the first column or
662 identifiers followed by `:' or `='. See variables
663 `add-log-current-defun-header-regexp' and
664 `add-log-current-defun-function'.
666 Has a preference of looking backwards."
669 (let ((location (point)))
670 (cond (add-log-current-defun-function
671 (funcall add-log-current-defun-function
))
672 ((memq major-mode add-log-lisp-like-modes
)
673 ;; If we are now precisely at the beginning of a defun,
674 ;; make sure beginning-of-defun finds that one
675 ;; rather than the previous one.
676 (or (eobp) (forward-char 1))
678 ;; Make sure we are really inside the defun found,
680 (when (and (looking-at "\\s(")
681 (progn (end-of-defun)
682 (< location
(point)))
683 (progn (forward-sexp -
1)
684 (>= location
(point))))
685 (if (looking-at "\\s(")
687 ;; Skip the defining construct name, typically "defun"
690 ;; The second element is usually a symbol being defined.
691 ;; If it is not, use the first symbol in it.
692 (skip-chars-forward " \t\n'(")
693 (buffer-substring-no-properties (point)
694 (progn (forward-sexp 1)
696 ((and (memq major-mode add-log-c-like-modes
)
699 ;; Use eq instead of = here to avoid
700 ;; error when at bob and char-after
702 (while (eq (char-after (- (point) 2)) ?
\\)
704 (looking-at "[ \t]*#[ \t]*define[ \t]")))
705 ;; Handle a C macro definition.
707 (while (eq (char-after (- (point) 2)) ?
\\) ;not =; note above
709 (search-forward "define")
710 (skip-chars-forward " \t")
711 (buffer-substring-no-properties (point)
712 (progn (forward-sexp 1)
714 ((memq major-mode add-log-c-like-modes
)
716 ;; See if we are in the beginning part of a function,
717 ;; before the open brace. If so, advance forward.
718 (while (not (looking-at "{\\|\\(\\s *$\\)"))
723 (when (progn (end-of-defun)
724 (< location
(point)))
729 ;; Skip back over typedefs of arglist.
730 (while (and (not (bobp))
731 (looking-at "[ \t\n]"))
733 ;; See if this is using the DEFUN macro used in Emacs,
734 ;; or the DEFUN macro used by the C library.
735 (if (condition-case nil
738 (while (= (preceding-char) ?
\\)
743 (looking-at "DEFUN\\b"))
749 (if (= (char-after (point)) ?
\")
752 (skip-chars-forward " ,")))
753 (buffer-substring-no-properties
755 (progn (forward-sexp 1)
757 (if (looking-at "^[+-]")
758 (change-log-get-method-definition)
759 ;; Ordinary C function syntax.
762 ;; Protect against "Unbalanced parens" error.
765 (down-list 1) ; into arglist
767 (skip-chars-backward " \t")
770 ;; Verify initial pos was after
771 ;; real start of function.
774 ;; For this purpose, include the line
775 ;; that has the decl keywords. This
776 ;; may also include some of the
777 ;; comments before the function.
778 (while (and (not (bobp))
781 (looking-at "[^\n\f]")))
783 (>= location
(point)))
784 ;; Consistency check: going down and up
785 ;; shouldn't take us back before BEG.
788 ;; Don't include any final whitespace
789 ;; in the name we use.
790 (skip-chars-backward " \t\n")
793 ;; Now find the right beginning of the name.
794 ;; Include certain keywords if they
796 (setq middle
(point))
798 ;; Ignore these subparts of a class decl
799 ;; and move back to the class name itself.
800 (while (looking-at "public \\|private ")
801 (skip-chars-backward " \t:")
804 (setq middle
(point))
808 "enum \\|struct \\|union \\|class ")
809 (setq middle
(point)))
811 (when (eq (preceding-char) ?
=)
813 (skip-chars-backward " \t")
815 (buffer-substring-no-properties
817 ((memq major-mode add-log-tex-like-modes
)
818 (if (re-search-backward
819 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)"
822 (goto-char (match-beginning 0))
823 (buffer-substring-no-properties
824 (1+ (point)) ; without initial backslash
825 (line-end-position)))))
826 ((eq major-mode
'texinfo-mode
)
827 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t
)
828 (match-string-no-properties 1)))
829 ((memq major-mode
'(perl-mode cperl-mode
))
830 (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t
)
831 (match-string-no-properties 1)))
832 ;; Emacs's autoconf-mode installs its own
833 ;; `add-log-current-defun-function'. This applies to
834 ;; a different mode apparently for editing .m4
836 ((eq major-mode
'autoconf-mode
)
837 (if (re-search-backward
838 "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t
)
839 (match-string-no-properties 3)))
841 ;; If all else fails, try heuristics
842 (let (case-fold-search
845 (when (re-search-backward
846 add-log-current-defun-header-regexp
849 (setq result
(or (match-string-no-properties 1)
850 (match-string-no-properties 0)))
851 ;; Strip whitespace away
852 (when (string-match "\\([^ \t\n\r\f].*[^ \t\n\r\f]\\)"
854 (setq result
(match-string-no-properties 1 result
)))
858 (defvar change-log-get-method-definition-md
)
860 ;; Subroutine used within change-log-get-method-definition.
861 ;; Add the last match in the buffer to the end of `md',
862 ;; followed by the string END; move to the end of that match.
863 (defun change-log-get-method-definition-1 (end)
864 (setq change-log-get-method-definition-md
865 (concat change-log-get-method-definition-md
868 (goto-char (match-end 0)))
870 (defun change-log-get-method-definition ()
871 "For objective C, return the method name if we are in a method."
872 (let ((change-log-get-method-definition-md "["))
874 (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t
)
875 (change-log-get-method-definition-1 " ")))
878 ((re-search-forward "^\\([-+]\\)[ \t\n\f\r]*\\(([^)]*)\\)?\\s-*" nil t
)
879 (change-log-get-method-definition-1 "")
880 (while (not (looking-at "[{;]"))
882 "\\([A-Za-z_]*:?\\)\\s-*\\(([^)]*)\\)?[A-Za-z_]*[ \t\n\f\r]*")
883 (change-log-get-method-definition-1 ""))
884 (concat change-log-get-method-definition-md
"]"))))))
886 (defun change-log-sortable-date-at ()
887 "Return date of log entry in a consistent form for sorting.
888 Point is assumed to be at the start of the entry."
890 (if (looking-at "^\\sw.........[0-9:+ ]*")
891 (let ((date (match-string-no-properties 0)))
893 (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date
)
894 (concat (match-string 1 date
) (match-string 2 date
)
895 (match-string 3 date
))
897 (timezone-make-date-sortable date
)
901 (defun change-log-resolve-conflict ()
902 "Function to be used in `smerge-resolve-function'."
903 (let ((buf (current-buffer)))
905 (insert-buffer-substring buf
(match-beginning 1) (match-end 1))
906 (save-match-data (change-log-mode))
907 (let ((other-buf (current-buffer)))
908 (with-current-buffer buf
911 (narrow-to-region (match-beginning 0) (match-end 0))
912 (replace-match (match-string 3) t t
)
913 (change-log-merge other-buf
))))))))
916 (defun change-log-merge (other-log)
917 "Merge the contents of ChangeLog file OTHER-LOG with this buffer.
918 Both must be found in Change Log mode (since the merging depends on
919 the appropriate motion commands). OTHER-LOG can be either a file name
922 Entries are inserted in chronological order. Both the current and
923 old-style time formats for entries are supported."
924 (interactive "*fLog file name to merge: ")
925 (if (not (eq major-mode
'change-log-mode
))
926 (error "Not in Change Log mode"))
927 (let ((other-buf (if (bufferp other-log
) other-log
928 (find-file-noselect other-log
)))
929 (buf (current-buffer))
932 (goto-char (point-min))
933 (set-buffer other-buf
)
934 (goto-char (point-min))
935 (if (not (eq major-mode
'change-log-mode
))
936 (error "%s not found in Change Log mode" other-log
))
937 ;; Loop through all the entries in OTHER-LOG.
939 (setq date1
(change-log-sortable-date-at))
941 end
(progn (forward-page) (point)))
942 ;; Look for an entry in original buffer that isn't later.
943 (with-current-buffer buf
944 (while (and (not (eobp))
945 (string< date1
(change-log-sortable-date-at)))
948 (insert-buffer-substring other-buf start end
)
949 ;; At the end of the original buffer, insert a newline to
950 ;; separate entries and then the rest of the file being
953 (and (= ?
\n (char-before))
954 (or (<= (1- (point)) (point-min))
955 (= ?
\n (char-before (1- (point)))))))
957 ;; Move to the end of it to terminate outer loop.
958 (with-current-buffer other-buf
959 (goto-char (point-max)))
960 (insert-buffer-substring other-buf start
)))))))
963 (defun change-log-redate ()
964 "Fix any old-style date entries in the current log file to default format."
968 (goto-char (point-min))
969 (while (re-search-forward "^\\sw.........[0-9:+ ]*" nil t
)
970 (unless (= 12 (- (match-end 0) (match-beginning 0)))
971 (let* ((date (save-match-data
972 (timezone-fix-time (match-string 0) nil nil
)))
973 (zone (if (consp (aref date
6))
974 (nth 1 (aref date
6)))))
975 (replace-match (format-time-string
977 (encode-time (aref date
5)
987 ;;; add-log.el ends here