annotate lisp/add-log.el @ 42292:fa1bc97b9adc

*** empty log message ***
author Pavel Janík <Pavel@Janik.cz>
date Mon, 24 Dec 2001 12:17:55 +0000
parents e41eca24ba8c
children 20c79f08a7da
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22388
2d0bece94ee7 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 22018
diff changeset
1 ;;; add-log.el --- change log maintenance commands for Emacs
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
2
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
3 ;; Copyright (C) 1985, 86, 88, 93, 94, 97, 98, 2000 Free Software Foundation, Inc.
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
4
38697
a19197c6442f Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents: 36604
diff changeset
5 ;; Maintainer: FSF
18277
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
6 ;; Keywords: tools
2247
2c7997f249eb Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1999
diff changeset
7
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
9
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
811
e694e0879463 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 678
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
13 ;; any later version.
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
14
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
18 ;; GNU General Public License for more details.
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
19
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13706
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13706
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13706
diff changeset
23 ;; Boston, MA 02111-1307, USA.
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
24
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
25 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
26
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
27 ;; This facility is documented in the Emacs Manual.
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2247
diff changeset
28
811
e694e0879463 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 678
diff changeset
29 ;;; Code:
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
30
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
31 (eval-when-compile
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
32 (require 'timezone))
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
33
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
34 (defgroup change-log nil
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
35 "Change log maintenance"
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
36 :group 'tools
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
37 :link '(custom-manual "(emacs)Change Log")
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
38 :prefix "change-log-"
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
39 :prefix "add-log-")
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
40
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
41
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
42 (defcustom change-log-default-name nil
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
43 "*Name of a change log file for \\[add-change-log-entry]."
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
44 :type '(choice (const :tag "default" nil)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
45 string)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
46 :group 'change-log)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
47
26613
7f7e6de546ac (change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents: 25273
diff changeset
48 (defcustom change-log-mode-hook nil
7f7e6de546ac (change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents: 25273
diff changeset
49 "Normal hook run by `change-log-mode'."
7f7e6de546ac (change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents: 25273
diff changeset
50 :type 'hook
7f7e6de546ac (change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents: 25273
diff changeset
51 :group 'change-log)
7f7e6de546ac (change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents: 25273
diff changeset
52
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
53 (defcustom add-log-current-defun-function nil
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
54 "*If non-nil, function to guess name of surrounding function.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
55 It is used by `add-log-current-defun' in preference to built-in rules.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
56 Returns function's name as a string, or nil if outside a function."
35936
61d0887bbd4e (add-log-current-defun-function)
Dave Love <fx@gnu.org>
parents: 34576
diff changeset
57 :type '(choice (const nil) function)
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
58 :group 'change-log)
4154
20a0593431b7 (add-log-current-defun-function): New defvar.
Roland McGrath <roland@gnu.org>
parents: 3897
diff changeset
59
14856
f64fa743c80f (add-log-full-name, add-log-mailing-address): Add autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents: 14528
diff changeset
60 ;;;###autoload
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
61 (defcustom add-log-full-name nil
4741
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
62 "*Full name of user, for inclusion in ChangeLog daily headers.
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
63 This defaults to the value returned by the function `user-full-name'."
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
64 :type '(choice (const :tag "Default" nil)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
65 string)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
66 :group 'change-log)
4741
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
67
14856
f64fa743c80f (add-log-full-name, add-log-mailing-address): Add autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents: 14528
diff changeset
68 ;;;###autoload
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
69 (defcustom add-log-mailing-address nil
4741
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
70 "*Electronic mail address of user, for inclusion in ChangeLog daily headers.
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
71 This defaults to the value of `user-mail-address'."
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
72 :type '(choice (const :tag "Default" nil)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
73 string)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
74 :group 'change-log)
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
75
18277
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
76 (defcustom add-log-time-format 'add-log-iso8601-time-string
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
77 "*Function that defines the time format.
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
78 For example, `add-log-iso8601-time-string', which gives the
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
79 date in international ISO 8601 format,
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
80 and `current-time-string' are two valid values."
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
81 :type '(radio (const :tag "International ISO 8601 format"
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
82 add-log-iso8601-time-string)
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
83 (const :tag "Old format, as returned by `current-time-string'"
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
84 current-time-string)
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
85 (function :tag "Other"))
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
86 :group 'change-log)
4741
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
87
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
88 (defcustom add-log-keep-changes-together nil
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
89 "*If non-nil, normally keep day's log entries for one file together.
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
90
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
91 Log entries for a given file made with \\[add-change-log-entry] or
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
92 \\[add-change-log-entry-other-window] will only be added to others \
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
93 for that file made
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
94 today if this variable is non-nil or that file comes first in today's
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
95 entries. Otherwise another entry for that file will be started. An
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
96 original log:
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
97
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
98 * foo (...): ...
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
99 * bar (...): change 1
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
100
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
101 in the latter case, \\[add-change-log-entry-other-window] in a \
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
102 buffer visiting `bar', yields:
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
103
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
104 * bar (...): -!-
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
105 * foo (...): ...
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
106 * bar (...): change 1
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
107
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
108 and in the former:
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
109
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
110 * foo (...): ...
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
111 * bar (...): change 1
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
112 (...): -!-
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
113
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
114 The NEW-ENTRY arg to `add-change-log-entry' can override the effect of
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
115 this variable."
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
116 :version "20.3"
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
117 :type 'boolean
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
118 :group 'change-log)
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
119
40315
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
120 (defcustom add-log-always-start-new-record nil
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
121 "*If non-nil, `add-change-log-entry' will always start a new record."
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
122 :version "21.2"
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
123 :type 'boolean
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
124 :group 'change-log)
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
125
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
126 (defcustom add-log-buffer-file-name-function nil
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
127 "*If non-nil, function to call to identify the full filename of a buffer.
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
128 This function is called with no argument. If this is nil, the default is to
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
129 use `buffer-file-name'."
35936
61d0887bbd4e (add-log-current-defun-function)
Dave Love <fx@gnu.org>
parents: 34576
diff changeset
130 :type '(choice (const nil) function)
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
131 :group 'change-log)
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
132
24289
7917ac967ee5 (add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 23215
diff changeset
133 (defcustom add-log-file-name-function nil
7917ac967ee5 (add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 23215
diff changeset
134 "*If non-nil, function to call to identify the filename for a ChangeLog entry.
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
135 This function is called with one argument, the value of variable
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
136 `buffer-file-name' in that buffer. If this is nil, the default is to
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
137 use the file's name relative to the directory of the change log file."
35936
61d0887bbd4e (add-log-current-defun-function)
Dave Love <fx@gnu.org>
parents: 34576
diff changeset
138 :type '(choice (const nil) function)
24289
7917ac967ee5 (add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 23215
diff changeset
139 :group 'change-log)
7917ac967ee5 (add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 23215
diff changeset
140
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
141
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
142 (defcustom change-log-version-info-enabled nil
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
143 "*If non-nil, enable recording version numbers with the changes."
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
144 :version "21.1"
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
145 :type 'boolean
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
146 :group 'change-log)
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
147
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
148 (defcustom change-log-version-number-regexp-list
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
149 (let ((re "\\([0-9]+\.[0-9.]+\\)"))
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
150 (list
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
151 ;; (defconst ad-version "2.15"
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
152 (concat "^(def[^ \t\n]+[ \t]+[^ \t\n][ \t]\"" re)
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
153 ;; Revision: pcl-cvs.el,v 1.72 1999/09/05 20:21:54 monnier Exp
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
154 (concat "^;+ *Revision: +[^ \t\n]+[ \t]+" re)))
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
155 "*List of regexps to search for version number.
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
156 The version number must be in group 1.
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
157 Note: The search is conducted only within 10%, at the beginning of the file."
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
158 :version "21.1"
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
159 :type '(repeat regexp)
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
160 :group 'change-log)
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
161
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
162 (defface change-log-date-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
163 '((t (:inherit font-lock-string-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
164 "Face used to highlight dates in date lines."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
165 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
166 :group 'change-log)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
167
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
168 (defface change-log-name-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
169 '((t (:inherit font-lock-constant-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
170 "Face for highlighting author names."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
171 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
172 :group 'change-log)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
173
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
174 (defface change-log-email-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
175 '((t (:inherit font-lock-variable-name-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
176 "Face for highlighting author email addresses."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
177 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
178 :group 'change-log)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
179
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
180 (defface change-log-file-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
181 '((t (:inherit font-lock-function-name-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
182 "Face for highlighting file names."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
183 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
184 :group 'change-log)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
185
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
186 (defface change-log-list-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
187 '((t (:inherit font-lock-keyword-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
188 "Face for highlighting parenthesized lists of functions or variables."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
189 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
190 :group 'change-log)
40315
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
191
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
192 (defface change-log-conditionals-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
193 '((t (:inherit font-lock-variable-name-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
194 "Face for highlighting conditionals of the form `[...]'."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
195 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
196 :group 'change-log)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
197
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
198 (defface change-log-function-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
199 '((t (:inherit font-lock-variable-name-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
200 "Face for highlighting items of the form `<....>'."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
201 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
202 :group 'change-log)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
203
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
204 (defface change-log-acknowledgement-face
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
205 '((t (:inherit font-lock-comment-face)))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
206 "Face for highlighting acknowledgments."
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
207 :version "21.1"
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
208 :group 'change-log)
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
209
9377
45228a0f6b78 (change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents: 9347
diff changeset
210 (defvar change-log-font-lock-keywords
16450
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
211 '(;;
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
212 ;; Date lines, new and old styles.
21009
f3149849a051 (change-log-font-lock-keywords): Recognize + in date.
Richard M. Stallman <rms@gnu.org>
parents: 20953
diff changeset
213 ("^\\sw.........[0-9:+ ]*"
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
214 (0 'change-log-date-face)
23215
c06f07cf6bba (change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents: 22388
diff changeset
215 ;; Name and e-mail; some people put e-mail in parens, not angles.
31720
601145997e91 (change-log-font-lock-keywords): Match names
Gerd Moellmann <gerd@gnu.org>
parents: 30809
diff changeset
216 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
217 (1 'change-log-name-face)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
218 (2 'change-log-email-face)))
16450
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
219 ;;
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
220 ;; File names.
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
221 ("^\t\\* \\([^ ,:([\n]+\\)"
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
222 (1 'change-log-file-face)
23215
c06f07cf6bba (change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents: 22388
diff changeset
223 ;; Possibly further names in a list:
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
224 ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
23215
c06f07cf6bba (change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents: 22388
diff changeset
225 ;; Possibly a parenthesized list of names:
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
226 ("\\= (\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face))
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
227 ("\\=, *\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face)))
16450
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
228 ;;
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
229 ;; Function or variable names.
23215
c06f07cf6bba (change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents: 22388
diff changeset
230 ("^\t(\\([^) ,:\n]+\\)"
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
231 (1 'change-log-list-face)
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
232 ("\\=, *\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face)))
16450
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
233 ;;
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
234 ;; Conditionals.
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
235 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals-face))
16450
82b0566ece27 Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents: 16035
diff changeset
236 ;;
29329
5b85d9e700da (change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents: 29243
diff changeset
237 ;; Function of change.
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
238 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face))
29329
5b85d9e700da (change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents: 29243
diff changeset
239 ;;
19439
854e48d82a01 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 19325
diff changeset
240 ;; Acknowledgements.
29329
5b85d9e700da (change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents: 29243
diff changeset
241 ("\\(^\t\\| \\)\\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
31813
b7491dcc3530 (change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents: 31794
diff changeset
242 2 'change-log-acknowledgement-face))
9377
45228a0f6b78 (change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents: 9347
diff changeset
243 "Additional expressions to highlight in Change Log mode.")
45228a0f6b78 (change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents: 9347
diff changeset
244
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
245 (defvar change-log-mode-map (make-sparse-keymap)
15889
ca8f142ef5d2 [fixing previous change]
Karl Heuer <kwzh@gnu.org>
parents: 15887
diff changeset
246 "Keymap for Change Log major mode.")
ca8f142ef5d2 [fixing previous change]
Karl Heuer <kwzh@gnu.org>
parents: 15887
diff changeset
247
15909
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
248 (defvar change-log-time-zone-rule nil
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
249 "Time zone used for calculating change log time stamps.
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
250 It takes the same format as the TZ argument of `set-time-zone-rule'.
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
251 If nil, use local time.")
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
252
18277
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
253 (defun add-log-iso8601-time-zone (time)
15909
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
254 (let* ((utc-offset (or (car (current-time-zone time)) 0))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
255 (sign (if (< utc-offset 0) ?- ?+))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
256 (sec (abs utc-offset))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
257 (ss (% sec 60))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
258 (min (/ sec 60))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
259 (mm (% min 60))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
260 (hh (/ min 60)))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
261 (format (cond ((not (zerop ss)) "%c%02d:%02d:%02d")
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
262 ((not (zerop mm)) "%c%02d:%02d")
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
263 (t "%c%02d"))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
264 sign hh mm ss)))
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
265
18277
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
266 (defun add-log-iso8601-time-string ()
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
267 (if change-log-time-zone-rule
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
268 (let ((tz (getenv "TZ"))
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
269 (now (current-time)))
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
270 (unwind-protect
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
271 (progn
30809
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
272 (set-time-zone-rule change-log-time-zone-rule)
18277
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
273 (concat
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
274 (format-time-string "%Y-%m-%d " now)
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
275 (add-log-iso8601-time-zone now)))
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
276 (set-time-zone-rule tz)))
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
277 (format-time-string "%Y-%m-%d")))
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
278
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
279 (defun change-log-name ()
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
280 "Return (system-dependent) default name for a change log file."
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
281 (or change-log-default-name
19477
a9629283bc4c (change-log-font-lock-keywords): Recognize "Patch by".
Richard M. Stallman <rms@gnu.org>
parents: 19439
diff changeset
282 (if (eq system-type 'vax-vms)
16035
9d8b374b5bb1 (change-log-name): Don't treat MSDOS, NT specially.
Richard M. Stallman <rms@gnu.org>
parents: 15909
diff changeset
283 "$CHANGE_LOG$.TXT"
9d8b374b5bb1 (change-log-name): Don't treat MSDOS, NT specially.
Richard M. Stallman <rms@gnu.org>
parents: 15909
diff changeset
284 "ChangeLog")))
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
285
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
286 ;;;###autoload
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
287 (defun prompt-for-change-log-name ()
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
288 "Prompt for a change log name."
12157
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
289 (let* ((default (change-log-name))
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
290 (name (expand-file-name
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
291 (read-file-name (format "Log file (default %s): " default)
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
292 nil default))))
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
293 ;; Handle something that is syntactically a directory name.
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
294 ;; Look for ChangeLog or whatever in that directory.
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
295 (if (string= (file-name-nondirectory name) "")
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
296 (expand-file-name (file-name-nondirectory default)
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
297 name)
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
298 ;; Handle specifying a file that is a directory.
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
299 (if (file-directory-p name)
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
300 (expand-file-name (file-name-nondirectory default)
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
301 (file-name-as-directory name))
f4a8265756e7 (prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents: 11816
diff changeset
302 name))))
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
303
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
304 (defun change-log-version-number-search ()
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
305 "Return version number of current buffer's file.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
306 This is the value returned by `vc-workfile-version' or, if that is
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
307 nil, by matching `change-log-version-number-regexp-list'."
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
308 (let* ((size (buffer-size))
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
309 (end
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
310 ;; The version number can be anywhere in the file, but
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
311 ;; restrict search to the file beginning: 10% should be
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
312 ;; enough to prevent some mishits.
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
313 ;;
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
314 ;; Apply percentage only if buffer size is bigger than
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
315 ;; approx 100 lines.
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
316 (if (> size (* 100 80))
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
317 (/ size 10)
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
318 size))
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
319 version)
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
320 (or (and buffer-file-name (vc-workfile-version buffer-file-name))
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
321 (save-restriction
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
322 (widen)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
323 (let ((regexps change-log-version-number-regexp-list))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
324 (while regexps
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
325 (save-excursion
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
326 (goto-char (point-min))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
327 (when (re-search-forward (pop regexps) end t)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
328 (setq version (match-string 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
329 regexps nil)))))))))
27003
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
330
f6f431fc901b (change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents: 26618
diff changeset
331
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
332 ;;;###autoload
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
333 (defun find-change-log (&optional file-name buffer-file)
2463
d3c9f0ad5964 (find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents: 2307
diff changeset
334 "Find a change log file for \\[add-change-log-entry] and return the name.
8042
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
335
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
336 Optional arg FILE-NAME specifies the file to use.
9886
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
337 If FILE-NAME is nil, use the value of `change-log-default-name'.
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
338 If 'change-log-default-name' is nil, behave as though it were 'ChangeLog'
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
339 \(or whatever we use on this operating system).
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
340
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
341 If 'change-log-default-name' contains a leading directory component, then
19477
a9629283bc4c (change-log-font-lock-keywords): Recognize "Patch by".
Richard M. Stallman <rms@gnu.org>
parents: 19439
diff changeset
342 simply find it in the current directory. Otherwise, search in the current
9886
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
343 directory and its successive parents for a file so named.
2463
d3c9f0ad5964 (find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents: 2307
diff changeset
344
d3c9f0ad5964 (find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents: 2307
diff changeset
345 Once a file is found, `change-log-default-name' is set locally in the
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
346 current buffer to the complete file name.
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
347 Optional arg BUFFER-FILE overrides `buffer-file-name'."
8042
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
348 ;; If user specified a file name or if this buffer knows which one to use,
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
349 ;; just use that.
2463
d3c9f0ad5964 (find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents: 2307
diff changeset
350 (or file-name
9886
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
351 (setq file-name (and change-log-default-name
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
352 (file-name-directory change-log-default-name)
f54af6fe889e (find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents: 9774
diff changeset
353 change-log-default-name))
8042
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
354 (progn
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
355 ;; Chase links in the source file
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
356 ;; and use the change log in the dir where it points.
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
357 (setq file-name (or (and (or buffer-file buffer-file-name)
8042
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
358 (file-name-directory
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
359 (file-chase-links
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
360 (or buffer-file buffer-file-name))))
8042
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
361 default-directory))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
362 (if (file-directory-p file-name)
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
363 (setq file-name (expand-file-name (change-log-name) file-name)))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
364 ;; Chase links before visiting the file.
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
365 ;; This makes it easier to use a single change log file
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
366 ;; for several related directories.
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
367 (setq file-name (file-chase-links file-name))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
368 (setq file-name (expand-file-name file-name))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
369 ;; Move up in the dir hierarchy till we find a change log file.
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
370 (let ((file1 file-name)
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
371 parent-dir)
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
372 (while (and (not (or (get-file-buffer file1) (file-exists-p file1)))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
373 (progn (setq parent-dir
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
374 (file-name-directory
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
375 (directory-file-name
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
376 (file-name-directory file1))))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
377 ;; Give up if we are already at the root dir.
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
378 (not (string= (file-name-directory file1)
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
379 parent-dir))))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
380 ;; Move up to the parent dir and try again.
19477
a9629283bc4c (change-log-font-lock-keywords): Recognize "Patch by".
Richard M. Stallman <rms@gnu.org>
parents: 19439
diff changeset
381 (setq file1 (expand-file-name
8042
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
382 (file-name-nondirectory (change-log-name))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
383 parent-dir)))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
384 ;; If we found a change log in a parent, use that.
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
385 (if (or (get-file-buffer file1) (file-exists-p file1))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
386 (setq file-name file1)))))
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
387 ;; Make a local variable in this buffer so we needn't search again.
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
388 (set (make-local-variable 'change-log-default-name) file-name)
0495d3085f00 (find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents: 6562
diff changeset
389 file-name)
2463
d3c9f0ad5964 (find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents: 2307
diff changeset
390
31794
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
391 (defun add-log-file-name (buffer-file log-file)
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
392 ;; Never want to add a change log entry for the ChangeLog file itself.
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
393 (unless (or (null buffer-file) (string= buffer-file log-file))
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
394 (if add-log-file-name-function
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
395 (funcall add-log-file-name-function buffer-file)
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
396 (setq buffer-file
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
397 (if (string-match
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
398 (concat "^" (regexp-quote (file-name-directory log-file)))
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
399 buffer-file)
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
400 (substring buffer-file (match-end 0))
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
401 (file-name-nondirectory buffer-file)))
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
402 ;; If we have a backup file, it's presumably because we're
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
403 ;; comparing old and new versions (e.g. for deleted
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
404 ;; functions) and we'll want to use the original name.
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
405 (if (backup-file-name-p buffer-file)
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
406 (file-name-sans-versions buffer-file)
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
407 buffer-file))))
31794
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
408
2463
d3c9f0ad5964 (find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents: 2307
diff changeset
409 ;;;###autoload
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
410 (defun add-change-log-entry (&optional whoami file-name other-window new-entry)
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
411 "Find change log file, and add an entry for today and an item for this file.
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
412 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
413 name and site.
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
414
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
415 Second arg FILE-NAME is file name of the change log.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
416 If nil, use the value of `change-log-default-name'.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
417
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
418 Third arg OTHER-WINDOW non-nil means visit in other window.
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
419
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
420 Fourth arg NEW-ENTRY non-nil means always create a new entry at the front;
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
421 never append to an existing entry. Option `add-log-keep-changes-together'
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
422 otherwise affects whether a new entry is created.
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
423
40315
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
424 Option `add-log-always-start-new-record' non-nil means always create a
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
425 new record, even when the last record was made on the same date and by
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
426 the same person.
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
427
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
428 The change log file can start with a copyright notice and a copying
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
429 permission notice. The first blank line indicates the end of these
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
430 notices.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
431
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
432 Today's date is calculated according to `change-log-time-zone-rule' if
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
433 non-nil, otherwise in local time."
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
434 (interactive (list current-prefix-arg
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
435 (prompt-for-change-log-name)))
13648
ce23ae11d3fa (add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents: 13505
diff changeset
436 (or add-log-full-name
ce23ae11d3fa (add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents: 13505
diff changeset
437 (setq add-log-full-name (user-full-name)))
ce23ae11d3fa (add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents: 13505
diff changeset
438 (or add-log-mailing-address
ce23ae11d3fa (add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents: 13505
diff changeset
439 (setq add-log-mailing-address user-mail-address))
4741
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
440 (if whoami
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
441 (progn
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
442 (setq add-log-full-name (read-input "Full name: " add-log-full-name))
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
443 ;; Note that some sites have room and phone number fields in
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
444 ;; full name which look silly when inserted. Rather than do
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
445 ;; anything about that here, let user give prefix argument so that
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
446 ;; s/he can edit the full name field in prompter if s/he wants.
4741
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
447 (setq add-log-mailing-address
c0ea0009268a add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents: 4380
diff changeset
448 (read-input "Mailing address: " add-log-mailing-address))))
31794
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
449
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
450 (let* ((defun (add-log-current-defun))
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
451 (version (and change-log-version-info-enabled
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
452 (change-log-version-number-search)))
34576
372841b7a5ad (add-change-log-entry): Only expand-file-name if non-nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32011
diff changeset
453 (buf-file-name (if add-log-buffer-file-name-function
372841b7a5ad (add-change-log-entry): Only expand-file-name if non-nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32011
diff changeset
454 (funcall add-log-buffer-file-name-function)
372841b7a5ad (add-change-log-entry): Only expand-file-name if non-nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32011
diff changeset
455 buffer-file-name))
372841b7a5ad (add-change-log-entry): Only expand-file-name if non-nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32011
diff changeset
456 (buffer-file (if buf-file-name (expand-file-name buf-file-name)))
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
457 (file-name (expand-file-name
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
458 (or file-name (find-change-log file-name buffer-file))))
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
459 ;; Set ITEM to the file name to use in the new item.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
460 (item (add-log-file-name buffer-file file-name))
32011
534b5a76bf8a (find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31813
diff changeset
461 bound)
1727
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
462
31794
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
463 (if (or (and other-window (not (equal file-name buffer-file-name)))
7e8ab579609b (add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31720
diff changeset
464 (window-dedicated-p (selected-window)))
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
465 (find-file-other-window file-name)
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
466 (find-file file-name))
5150
60fa14264c3b (add-change-log-entry): put buffer in change-log-mode.
Richard M. Stallman <rms@gnu.org>
parents: 5038
diff changeset
467 (or (eq major-mode 'change-log-mode)
60fa14264c3b (add-change-log-entry): put buffer in change-log-mode.
Richard M. Stallman <rms@gnu.org>
parents: 5038
diff changeset
468 (change-log-mode))
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
469 (undo-boundary)
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
470 (goto-char (point-min))
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
471
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
472 ;; If file starts with a copyright and permission notice, skip them.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
473 ;; Assume they end at first blank line.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
474 (when (looking-at "Copyright")
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
475 (search-forward "\n\n")
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
476 (skip-chars-forward "\n"))
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
477
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
478 ;; Advance into first entry if it is usable; else make new one.
18277
7509948b0121 (add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17923
diff changeset
479 (let ((new-entry (concat (funcall add-log-time-format)
15909
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
480 " " add-log-full-name
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
481 " <" add-log-mailing-address ">")))
40315
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
482 (if (and (not add-log-always-start-new-record)
e41eca24ba8c (add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents: 39625
diff changeset
483 (looking-at (regexp-quote new-entry)))
15909
088510eef043 Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents: 15889
diff changeset
484 (forward-line 1)
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
485 (insert new-entry "\n\n")
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
486 (forward-line -1)))
1727
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
487
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
488 ;; Determine where we should stop searching for a usable
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
489 ;; item to add to, within this entry.
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
490 (setq bound
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
491 (save-excursion
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
492 (if (looking-at "\n*[^\n* \t]")
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
493 (skip-chars-forward "\n")
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
494 (if add-log-keep-changes-together
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
495 (forward-page) ; page delimits entries for date
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
496 (forward-paragraph))) ; paragraph delimits entries for file
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
497 (point)))
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
498
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
499 ;; Now insert the new line for this item.
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
500 (cond ((re-search-forward "^\\s *\\*\\s *$" bound t)
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
501 ;; Put this file name into the existing empty item.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
502 (if item
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
503 (insert item)))
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
504 ((and (not new-entry)
12551
572a8ef6b1f4 (add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents: 12157
diff changeset
505 (let (case-fold-search)
572a8ef6b1f4 (add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents: 12157
diff changeset
506 (re-search-forward
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
507 (concat (regexp-quote (concat "* " item))
12551
572a8ef6b1f4 (add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents: 12157
diff changeset
508 ;; Don't accept `foo.bar' when
572a8ef6b1f4 (add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents: 12157
diff changeset
509 ;; looking for `foo':
572a8ef6b1f4 (add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents: 12157
diff changeset
510 "\\(\\s \\|[(),:]\\)")
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
511 bound t)))
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
512 ;; Add to the existing item for the same file.
1727
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
513 (re-search-forward "^\\s *$\\|^\\s \\*")
12551
572a8ef6b1f4 (add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents: 12157
diff changeset
514 (goto-char (match-beginning 0))
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
515 ;; Delete excess empty lines; make just 2.
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
516 (while (and (not (eobp)) (looking-at "^\\s *$"))
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
517 (delete-region (point) (line-beginning-position 2)))
30809
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
518 (insert-char ?\n 2)
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
519 (forward-line -2)
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
520 (indent-relative-maybe))
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
521 (t
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
522 ;; Make a new item.
678
8cff3b3bd089 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 666
diff changeset
523 (while (looking-at "\\sW")
8cff3b3bd089 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 666
diff changeset
524 (forward-line 1))
912
1c37c99856de *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
525 (while (and (not (eobp)) (looking-at "^\\s *$"))
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
526 (delete-region (point) (line-beginning-position 2)))
30809
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
527 (insert-char ?\n 3)
837
a8aef92e0025 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 811
diff changeset
528 (forward-line -2)
678
8cff3b3bd089 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 666
diff changeset
529 (indent-to left-margin)
30809
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
530 (insert "* ")
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
531 (if item (insert item))))
837
a8aef92e0025 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 811
diff changeset
532 ;; Now insert the function name, if we have one.
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
533 ;; Point is at the item for this file,
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
534 ;; either at the end of the line or at the first blank line.
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
535 (if defun
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
536 (progn
678
8cff3b3bd089 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 666
diff changeset
537 ;; Make it easy to get rid of the function name.
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
538 (undo-boundary)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
539 (unless (save-excursion
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
540 (beginning-of-line 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
541 (looking-at "\\s *$"))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
542 (insert ?\ ))
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
543 ;; See if the prev function name has a message yet or not.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
544 ;; If not, merge the two items.
29243
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
545 (let ((pos (point-marker)))
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
546 (if (and (skip-syntax-backward " ")
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
547 (skip-chars-backward "):")
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
548 (looking-at "):")
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
549 (progn (delete-region (+ 1 (point)) (+ 2 (point))) t)
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
550 (> fill-column (+ (current-column) (length defun) 3)))
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
551 (progn (delete-region (point) pos)
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
552 (insert ", "))
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
553 (goto-char pos)
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
554 (insert "("))
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
555 (set-marker pos nil))
e5643646a988 (add-change-log-entry): Merge the current entry with the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 28446
diff changeset
556 (insert defun "): ")
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
557 (if version
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
558 (insert version ?\ )))
837
a8aef92e0025 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 811
diff changeset
559 ;; No function name, so put in a colon unless we have just a star.
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
560 (unless (save-excursion
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
561 (beginning-of-line 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
562 (looking-at "\\s *\\(\\*\\s *\\)?$"))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
563 (insert ": ")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
564 (if version (insert version ?\ ))))))
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
565
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
566 ;;;###autoload
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
567 (defun add-change-log-entry-other-window (&optional whoami file-name)
39625
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
568 "Find change log file in other window and add entry and item.
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
569 This is just like `add-change-log-entry' except that it displays
e441240482b2 (add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents: 38697
diff changeset
570 the change log file in another window."
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
571 (interactive (if current-prefix-arg
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
572 (list current-prefix-arg
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
573 (prompt-for-change-log-name))))
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
574 (add-change-log-entry whoami file-name t))
1727
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
575 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
661
36fbc3f71803 Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
576
980
b62886fbf2a7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 953
diff changeset
577 ;;;###autoload
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
578 (defun change-log-mode ()
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3499
diff changeset
579 "Major mode for editing change logs; like Indented Text Mode.
912
1c37c99856de *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
580 Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74.
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
581 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window].
951
c23539669808 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 947
diff changeset
582 Each entry behaves as a paragraph, and the entries for one day as a page.
c23539669808 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 947
diff changeset
583 Runs `change-log-mode-hook'."
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
584 (interactive)
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
585 (kill-all-local-variables)
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
586 (indented-text-mode)
1727
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
587 (setq major-mode 'change-log-mode
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
588 mode-name "Change Log"
d6cc12c97a59 (add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents: 1644
diff changeset
589 left-margin 8
13706
ba34746d66fd (change-log-mode): Defaults for `indent-tabs-mode'
Karl Heuer <kwzh@gnu.org>
parents: 13648
diff changeset
590 fill-column 74
15887
18c1dcf40139 (change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents: 15299
diff changeset
591 indent-tabs-mode t
18c1dcf40139 (change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents: 15299
diff changeset
592 tab-width 8)
15889
ca8f142ef5d2 [fixing previous change]
Karl Heuer <kwzh@gnu.org>
parents: 15887
diff changeset
593 (use-local-map change-log-mode-map)
15887
18c1dcf40139 (change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents: 15299
diff changeset
594 (set (make-local-variable 'fill-paragraph-function)
18c1dcf40139 (change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents: 15299
diff changeset
595 'change-log-fill-paragraph)
21719
c888284a54f7 (change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents: 21629
diff changeset
596 ;; We really do want "^" in paragraph-start below: it is only the
c888284a54f7 (change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents: 21629
diff changeset
597 ;; lines that begin at column 0 (despite the left-margin of 8) that
c888284a54f7 (change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents: 21629
diff changeset
598 ;; we are looking for. Adding `* ' allows eliding the blank line
c888284a54f7 (change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents: 21629
diff changeset
599 ;; between entries for different files.
21749
84df514f7719 (change-log-mode): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents: 21719
diff changeset
600 (set (make-local-variable 'paragraph-start) "\\s *$\\|\f\\|^\\<")
21719
c888284a54f7 (change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents: 21629
diff changeset
601 (set (make-local-variable 'paragraph-separate) paragraph-start)
1078
15b4ed20e524 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1062
diff changeset
602 ;; Match null string on the date-line so that the date-line
15b4ed20e524 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1062
diff changeset
603 ;; is grouped with what follows.
4380
0c7aefc58e0f (change-log-mode): Use \f for formfeed, to avoid syntax error.
Richard M. Stallman <rms@gnu.org>
parents: 4157
diff changeset
604 (set (make-local-variable 'page-delimiter) "^\\<\\|^\f")
678
8cff3b3bd089 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 666
diff changeset
605 (set (make-local-variable 'version-control) 'never)
8cff3b3bd089 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 666
diff changeset
606 (set (make-local-variable 'adaptive-fill-regexp) "\\s *")
9471
1b933ccf3c20 * add-log.el: (change-log-mode): Set font-lock-defaults.
Simon Marshall <simon@gnu.org>
parents: 9397
diff changeset
607 (set (make-local-variable 'font-lock-defaults)
35936
61d0887bbd4e (add-log-current-defun-function)
Dave Love <fx@gnu.org>
parents: 34576
diff changeset
608 '(change-log-font-lock-keywords t nil nil backward-paragraph))
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
609 (run-hooks 'change-log-mode-hook))
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
610
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
611 ;; It might be nice to have a general feature to replace this. The idea I
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
612 ;; have is a variable giving a regexp matching text which should not be
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
613 ;; moved from bol by filling. change-log-mode would set this to "^\\s *\\s(".
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
614 ;; But I don't feel up to implementing that today.
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
615 (defun change-log-fill-paragraph (&optional justify)
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
616 "Fill the paragraph, but preserve open parentheses at beginning of lines.
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
617 Prefix arg means justify as well."
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
618 (interactive "P")
16505
39efcea11aad (change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents: 16450
diff changeset
619 (let ((end (progn (forward-paragraph) (point)))
39efcea11aad (change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents: 16450
diff changeset
620 (beg (progn (backward-paragraph) (point)))
13505
86470b361571 (change-log-mode): Remove incorrect "^" anchors from
Richard M. Stallman <rms@gnu.org>
parents: 13282
diff changeset
621 (paragraph-start (concat paragraph-start "\\|\\s *\\s(")))
16505
39efcea11aad (change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents: 16450
diff changeset
622 (fill-region beg end justify)
39efcea11aad (change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents: 16450
diff changeset
623 t))
4157
d2316090d029 (prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents: 4154
diff changeset
624
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
625 (defcustom add-log-current-defun-header-regexp
29329
5b85d9e700da (change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents: 29243
diff changeset
626 "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"
17413
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
627 "*Heuristic regexp used by `add-log-current-defun' for unknown major modes."
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
628 :type 'regexp
9fa0ed8da0b1 Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 16505
diff changeset
629 :group 'change-log)
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
630
6562
0541a368505c (add-log-current-defun): Autoload this.
Roland McGrath <roland@gnu.org>
parents: 6309
diff changeset
631 ;;;###autoload
17912
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
632 (defvar add-log-lisp-like-modes
21629
2da609ac7ab1 (change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents: 21009
diff changeset
633 '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)
17912
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
634 "*Modes that look like Lisp to `add-log-current-defun'.")
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
635
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
636 ;;;###autoload
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
637 (defvar add-log-c-like-modes
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
638 '(c-mode c++-mode c++-c-mode objc-mode)
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
639 "*Modes that look like C to `add-log-current-defun'.")
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
640
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
641 ;;;###autoload
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
642 (defvar add-log-tex-like-modes
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
643 '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode)
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
644 "*Modes that look like TeX to `add-log-current-defun'.")
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
645
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
646 ;;;###autoload
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
647 (defun add-log-current-defun ()
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
648 "Return name of function definition point is in, or nil.
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
649
3499
6428162f137c (add-log-current-defun): Fix typos in last change.
Richard M. Stallman <rms@gnu.org>
parents: 3486
diff changeset
650 Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...),
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
651 Texinfo (@node titles) and Perl.
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
652
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
653 Other modes are handled by a heuristic that looks in the 10K before
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
654 point for uppercase headings starting in the first column or
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
655 identifiers followed by `:' or `='. See variables
27277
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
656 `add-log-current-defun-header-regexp' and
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
657 `add-log-current-defun-function'
666
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
658
7fa6b835da67 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 661
diff changeset
659 Has a preference of looking backwards."
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
660 (condition-case nil
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
661 (save-excursion
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
662 (let ((location (point)))
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
663 (cond (add-log-current-defun-function
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
664 (funcall add-log-current-defun-function))
27277
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
665 ((memq major-mode add-log-lisp-like-modes)
13086
1bc6075184d7 (add-log-current-defun): Ignore quotes before fcn name.
Richard M. Stallman <rms@gnu.org>
parents: 12551
diff changeset
666 ;; If we are now precisely at the beginning of a defun,
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
667 ;; make sure beginning-of-defun finds that one
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
668 ;; rather than the previous one.
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
669 (or (eobp) (forward-char 1))
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
670 (beginning-of-defun)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
671 ;; Make sure we are really inside the defun found,
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
672 ;; not after it.
21944
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
673 (when (and (looking-at "\\s(")
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
674 (progn (end-of-defun)
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
675 (< location (point)))
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
676 (progn (forward-sexp -1)
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
677 (>= location (point))))
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
678 (if (looking-at "\\s(")
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
679 (forward-char 1))
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
680 ;; Skip the defining construct name, typically "defun"
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
681 ;; or "defvar".
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
682 (forward-sexp 1)
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
683 ;; The second element is usually a symbol being defined.
8e606f5208eb (add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents: 21943
diff changeset
684 ;; If it is not, use the first symbol in it.
22018
6e80b7be8ac9 Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 22016
diff changeset
685 (skip-chars-forward " \t\n'(")
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
686 (buffer-substring-no-properties (point)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
687 (progn (forward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
688 (point)))))
17912
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
689 ((and (memq major-mode add-log-c-like-modes)
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
690 (save-excursion
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
691 (beginning-of-line)
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
692 ;; Use eq instead of = here to avoid
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
693 ;; error when at bob and char-after
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
694 ;; returns nil.
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
695 (while (eq (char-after (- (point) 2)) ?\\)
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
696 (forward-line -1))
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
697 (looking-at "[ \t]*#[ \t]*define[ \t]")))
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
698 ;; Handle a C macro definition.
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
699 (beginning-of-line)
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
700 (while (eq (char-after (- (point) 2)) ?\\) ;not =; note above
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
701 (forward-line -1))
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
702 (search-forward "define")
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
703 (skip-chars-forward " \t")
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
704 (buffer-substring-no-properties (point)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
705 (progn (forward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
706 (point))))
17912
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
707 ((memq major-mode add-log-c-like-modes)
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
708 (beginning-of-line)
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
709 ;; See if we are in the beginning part of a function,
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
710 ;; before the open brace. If so, advance forward.
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
711 (while (not (looking-at "{\\|\\(\\s *$\\)"))
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
712 (forward-line 1))
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
713 (or (eobp)
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
714 (forward-char 1))
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
715 (beginning-of-defun)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
716 (when (progn (end-of-defun)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
717 (< location (point)))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
718 (backward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
719 (let (beg tem)
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
720
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
721 (forward-line -1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
722 ;; Skip back over typedefs of arglist.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
723 (while (and (not (bobp))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
724 (looking-at "[ \t\n]"))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
725 (forward-line -1))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
726 ;; See if this is using the DEFUN macro used in Emacs,
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
727 ;; or the DEFUN macro used by the C library.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
728 (if (condition-case nil
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
729 (and (save-excursion
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
730 (end-of-line)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
731 (while (= (preceding-char) ?\\)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
732 (end-of-line 2))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
733 (backward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
734 (beginning-of-line)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
735 (setq tem (point))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
736 (looking-at "DEFUN\\b"))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
737 (>= location tem))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
738 (error nil))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
739 (progn
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
740 (goto-char tem)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
741 (down-list 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
742 (if (= (char-after (point)) ?\")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
743 (progn
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
744 (forward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
745 (skip-chars-forward " ,")))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
746 (buffer-substring-no-properties
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
747 (point)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
748 (progn (forward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
749 (point))))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
750 (if (looking-at "^[+-]")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
751 (change-log-get-method-definition)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
752 ;; Ordinary C function syntax.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
753 (setq beg (point))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
754 (if (and
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
755 ;; Protect against "Unbalanced parens" error.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
756 (condition-case nil
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
757 (progn
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
758 (down-list 1) ; into arglist
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
759 (backward-up-list 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
760 (skip-chars-backward " \t")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
761 t)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
762 (error nil))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
763 ;; Verify initial pos was after
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
764 ;; real start of function.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
765 (save-excursion
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
766 (goto-char beg)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
767 ;; For this purpose, include the line
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
768 ;; that has the decl keywords. This
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
769 ;; may also include some of the
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
770 ;; comments before the function.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
771 (while (and (not (bobp))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
772 (save-excursion
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
773 (forward-line -1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
774 (looking-at "[^\n\f]")))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
775 (forward-line -1))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
776 (>= location (point)))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
777 ;; Consistency check: going down and up
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
778 ;; shouldn't take us back before BEG.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
779 (> (point) beg))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
780 (let (end middle)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
781 ;; Don't include any final whitespace
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
782 ;; in the name we use.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
783 (skip-chars-backward " \t\n")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
784 (setq end (point))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
785 (backward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
786 ;; Now find the right beginning of the name.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
787 ;; Include certain keywords if they
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
788 ;; precede the name.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
789 (setq middle (point))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
790 (forward-word -1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
791 ;; Ignore these subparts of a class decl
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
792 ;; and move back to the class name itself.
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
793 (while (looking-at "public \\|private ")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
794 (skip-chars-backward " \t:")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
795 (setq end (point))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
796 (backward-sexp 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
797 (setq middle (point))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
798 (forward-word -1))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
799 (and (bolp)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
800 (looking-at
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
801 "enum \\|struct \\|union \\|class ")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
802 (setq middle (point)))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
803 (goto-char end)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
804 (when (eq (preceding-char) ?=)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
805 (forward-char -1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
806 (skip-chars-backward " \t")
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
807 (setq end (point)))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
808 (buffer-substring-no-properties
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
809 middle end))))))))
17912
653987823f79 (add-log-lisp-like-modes, add-log-c-like-modes, add-log-tex-like-modes):
Erik Naggum <erik@naggum.no>
parents: 17413
diff changeset
810 ((memq major-mode add-log-tex-like-modes)
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
811 (if (re-search-backward
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
812 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)"
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
813 nil t)
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
814 (progn
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
815 (goto-char (match-beginning 0))
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
816 (buffer-substring-no-properties
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
817 (1+ (point)) ; without initial backslash
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
818 (line-end-position)))))
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
819 ((eq major-mode 'texinfo-mode)
9397
eba13d81ba0b (add-log-current-defun): In texinfo-mode,
Richard M. Stallman <rms@gnu.org>
parents: 9377
diff changeset
820 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
821 (match-string-no-properties 1)))
36604
9a50e930a703 (add-log-current-defun): Check major-mode for `cperl-mode' as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35936
diff changeset
822 ((memq major-mode '(perl-mode cperl-mode))
9347
1a69634e3477 (add-log-current-defun): Handle Perl specially.
Richard M. Stallman <rms@gnu.org>
parents: 9008
diff changeset
823 (if (re-search-backward "^sub[ \t]+\\([^ \t\n]+\\)" nil t)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
824 (match-string-no-properties 1)))
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
825 ;; Emacs's autoconf-mode installs its own
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
826 ;; `add-log-current-defun-function'. This applies to
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
827 ;; a different mode apparently for editing .m4
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
828 ;; autoconf source.
27945
c11a0bbb5c88 (add-log-current-defun): Add support for
Gerd Moellmann <gerd@gnu.org>
parents: 27310
diff changeset
829 ((eq major-mode 'autoconf-mode)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
830 (if (re-search-backward
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
831 "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
832 (match-string-no-properties 3)))
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
833 (t
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
834 ;; If all else fails, try heuristics
27277
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
835 (let (case-fold-search
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
836 result)
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
837 (end-of-line)
27277
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
838 (when (re-search-backward
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
839 add-log-current-defun-header-regexp
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
840 (- (point) 10000)
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
841 t)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
842 (setq result (or (match-string-no-properties 1)
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
843 (match-string-no-properties 0)))
27277
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
844 ;; Strip whitespace away
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
845 (when (string-match "\\([^ \t\n\r\f].*[^ \t\n\r\f]\\)"
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
846 result)
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
847 (setq result (match-string-no-properties 1 result)))
27277
9fdcfef41c64 (add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents: 27240
diff changeset
848 result))))))
1447
75fa9ad982a5 (add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents: 1369
diff changeset
849 (error nil)))
999
d8d503897aa5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 980
diff changeset
850
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
851 (defvar change-log-get-method-definition-md)
13282
69fe836d7f02 (get-method-definition, get-method-definition-1):
Richard M. Stallman <rms@gnu.org>
parents: 13255
diff changeset
852
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
853 ;; Subroutine used within change-log-get-method-definition.
11749
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
854 ;; Add the last match in the buffer to the end of `md',
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
855 ;; followed by the string END; move to the end of that match.
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
856 (defun change-log-get-method-definition-1 (end)
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
857 (setq change-log-get-method-definition-md
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
858 (concat change-log-get-method-definition-md
28446
28009885f082 Don't require cl, fortran.
Dave Love <fx@gnu.org>
parents: 27945
diff changeset
859 (match-string 1)
13282
69fe836d7f02 (get-method-definition, get-method-definition-1):
Richard M. Stallman <rms@gnu.org>
parents: 13255
diff changeset
860 end))
11749
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
861 (goto-char (match-end 0)))
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
862
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
863 (defun change-log-get-method-definition ()
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
864 "For objective C, return the method name if we are in a method."
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
865 (let ((change-log-get-method-definition-md "["))
11749
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
866 (save-excursion
11816
2a8e1b01bc15 (get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents: 11757
diff changeset
867 (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t)
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
868 (change-log-get-method-definition-1 " ")))
11749
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
869 (save-excursion
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
870 (cond
11816
2a8e1b01bc15 (get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents: 11757
diff changeset
871 ((re-search-forward "^\\([-+]\\)[ \t\n\f\r]*\\(([^)]*)\\)?\\s-*" nil t)
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
872 (change-log-get-method-definition-1 "")
11749
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
873 (while (not (looking-at "[{;]"))
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
874 (looking-at
11816
2a8e1b01bc15 (get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents: 11757
diff changeset
875 "\\([A-Za-z_]*:?\\)\\s-*\\(([^)]*)\\)?[A-Za-z_]*[ \t\n\f\r]*")
20402
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
876 (change-log-get-method-definition-1 ""))
108100aa1991 (change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents: 19904
diff changeset
877 (concat change-log-get-method-definition-md "]"))))))
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
878
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
879 (defun change-log-sortable-date-at ()
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
880 "Return date of log entry in a consistent form for sorting.
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
881 Point is assumed to be at the start of the entry."
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
882 (require 'timezone)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
883 (if (looking-at "^\\sw.........[0-9:+ ]*")
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
884 (let ((date (match-string-no-properties 0)))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
885 (if date
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
886 (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
887 (concat (match-string 1 date) (match-string 2 date)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
888 (match-string 3 date))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
889 (condition-case nil
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
890 (timezone-make-date-sortable date)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
891 (error nil)))))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
892 (error "Bad date")))
11749
8da04214faed (get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents: 11517
diff changeset
893
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
894 ;;;###autoload
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
895 (defun change-log-merge (other-log)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
896 "Merge the contents of ChangeLog file OTHER-LOG with this buffer.
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
897 Both must be found in Change Log mode (since the merging depends on
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
898 the appropriate motion commands).
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
899
30809
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
900 Entries are inserted in chronological order. Both the current and
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
901 old-style time formats for entries are supported."
27240
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
902 (interactive "*fLog file name to merge: ")
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
903 (if (not (eq major-mode 'change-log-mode))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
904 (error "Not in Change Log mode"))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
905 (let ((other-buf (find-file-noselect other-log))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
906 (buf (current-buffer))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
907 date1 start end)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
908 (save-excursion
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
909 (goto-char (point-min))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
910 (set-buffer other-buf)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
911 (goto-char (point-min))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
912 (if (not (eq major-mode 'change-log-mode))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
913 (error "%s not found in Change Log mode" other-log))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
914 ;; Loop through all the entries in OTHER-LOG.
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
915 (while (not (eobp))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
916 (setq date1 (change-log-sortable-date-at))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
917 (setq start (point)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
918 end (progn (forward-page) (point)))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
919 ;; Look for an entry in original buffer that isn't later.
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
920 (with-current-buffer buf
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
921 (while (and (not (eobp))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
922 (string< date1 (change-log-sortable-date-at)))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
923 (forward-page))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
924 (if (not (eobp))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
925 (insert-buffer-substring other-buf start end)
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
926 ;; At the end of the original buffer, insert a newline to
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
927 ;; separate entries and then the rest of the file being
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
928 ;; merged. Move to the end of it to terminate outer loop.
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
929 (insert "\n")
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
930 (insert-buffer-substring other-buf start
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
931 (with-current-buffer other-buf
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
932 (goto-char (point-max))
d7748c3e79ad (add-log-debugging): Deleted.
Dave Love <fx@gnu.org>
parents: 27003
diff changeset
933 (point)))))))))
999
d8d503897aa5 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 980
diff changeset
934
30809
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
935 ;;;###autoload
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
936 (defun change-log-redate ()
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
937 "Fix any old-style date entries in the current log file to default format."
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
938 (interactive)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
939 (require 'timezone)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
940 (save-excursion
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
941 (goto-char (point-min))
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
942 (while (re-search-forward "^\\sw.........[0-9:+ ]*" nil t)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
943 (unless (= 12 (- (match-end 0) (match-beginning 0)))
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
944 (let* ((date (save-match-data
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
945 (timezone-fix-time (match-string 0) nil nil)))
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
946 (zone (if (consp (aref date 6))
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
947 (nth 1 (aref date 6)))))
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
948 (replace-match (format-time-string
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
949 "%Y-%m-%d "
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
950 (encode-time (aref date 5)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
951 (aref date 4)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
952 (aref date 3)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
953 (aref date 2)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
954 (aref date 1)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
955 (aref date 0)
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
956 zone))))))))
3aa7c156087a (change-log-merge): Doc fix.
Dave Love <fx@gnu.org>
parents: 29329
diff changeset
957
980
b62886fbf2a7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 953
diff changeset
958 (provide 'add-log)
b62886fbf2a7 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 953
diff changeset
959
811
e694e0879463 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 678
diff changeset
960 ;;; add-log.el ends here