Mercurial > emacs
annotate lisp/add-log.el @ 88196:a71ec02fb6d3
(rmail): Only insert the file if it actually exists.
(rmail-show-message): Do not display labels if there are no
messages. This corrects the mistake if visiting an empty file,
but it doesn't fix the situation where you delete the all messages
and expunge them. This may leave the labels of the last message
in the modeline.
author | Alex Schroeder <alex@gnu.org> |
---|---|
date | Tue, 17 Jan 2006 23:05:56 +0000 |
parents | d7ddb3e565de |
children |
rev | line source |
---|---|
22388 | 1 ;;; add-log.el --- change log maintenance commands for Emacs |
661 | 2 |
88155 | 3 ;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002, |
4 ;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. | |
661 | 5 |
38697
a19197c6442f
Keyword added and FSF specified as Maintainer.
Pavel Janík <Pavel@Janik.cz>
parents:
36604
diff
changeset
|
6 ;; Maintainer: FSF |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
7 ;; Keywords: tools |
2247
2c7997f249eb
Add or correct keywords
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1999
diff
changeset
|
8 |
661 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; 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
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
661 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
88155 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
661 | 25 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
27 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
28 ;; 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
|
29 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
678
diff
changeset
|
30 ;;; Code: |
661 | 31 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
32 (eval-when-compile |
28446 | 33 (require 'timezone)) |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
34 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
35 (defgroup change-log nil |
88155 | 36 "Change log maintenance." |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
37 :group 'tools |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
38 :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
|
39 :prefix "change-log-" |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
40 :prefix "add-log-") |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
41 |
661 | 42 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
43 (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
|
44 "*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
|
45 :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
|
46 string) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
47 :group 'change-log) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
48 |
26613
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
49 (defcustom change-log-mode-hook nil |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
50 "Normal hook run by `change-log-mode'." |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
51 :type 'hook |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
52 :group 'change-log) |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
53 |
88155 | 54 ;; Many modes set this variable, so avoid warnings. |
55 ;;;###autoload | |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
56 (defcustom add-log-current-defun-function nil |
28446 | 57 "*If non-nil, function to guess name of surrounding function. |
58 It is used by `add-log-current-defun' in preference to built-in rules. | |
59 Returns function's name as a string, or nil if outside a function." | |
35936 | 60 :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
|
61 :group 'change-log) |
4154
20a0593431b7
(add-log-current-defun-function): New defvar.
Roland McGrath <roland@gnu.org>
parents:
3897
diff
changeset
|
62 |
14856
f64fa743c80f
(add-log-full-name, add-log-mailing-address): Add autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
14528
diff
changeset
|
63 ;;;###autoload |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
64 (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
|
65 "*Full name of user, for inclusion in ChangeLog daily headers. |
27240 | 66 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
|
67 :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
|
68 string) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
69 :group 'change-log) |
4741
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
70 |
14856
f64fa743c80f
(add-log-full-name, add-log-mailing-address): Add autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
14528
diff
changeset
|
71 ;;;###autoload |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
72 (defcustom add-log-mailing-address nil |
88155 | 73 "*Email addresses of user, for inclusion in ChangeLog headers. |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
74 This defaults to the value of `user-mail-address'. In addition to |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
75 being a simple string, this value can also be a list. All elements |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
76 will be recognized as referring to the same user; when creating a new |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
77 ChangeLog entry, one element will be chosen at random." |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
78 :type '(choice (const :tag "Default" nil) |
46632
ac754a11b012
(add-log-mailing-address): Fix type. Can be a string.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
45267
diff
changeset
|
79 (string :tag "String") |
ac754a11b012
(add-log-mailing-address): Fix type. Can be a string.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
45267
diff
changeset
|
80 (repeat :tag "List of Strings" string)) |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
81 :group 'change-log) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
82 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
83 (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
|
84 "*Function that defines the time format. |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
85 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
|
86 date in international ISO 8601 format, |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
87 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
|
88 :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
|
89 add-log-iso8601-time-string) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
90 (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
|
91 current-time-string) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
92 (function :tag "Other")) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
93 :group 'change-log) |
4741
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
94 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
95 (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
|
96 "*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
|
97 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
98 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
|
99 \\[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
|
100 for that file made |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
101 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
|
102 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
|
103 original log: |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
104 |
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 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
|
109 buffer visiting `bar', yields: |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
110 |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
111 * bar (...): -!- |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
112 * foo (...): ... |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
113 * bar (...): change 1 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
114 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
115 and in the former: |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
116 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
117 * foo (...): ... |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
118 * bar (...): change 1 |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
119 (...): -!- |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
120 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
121 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
|
122 this variable." |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
123 :version "20.3" |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
124 :type 'boolean |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
125 :group 'change-log) |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
126 |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
127 (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
|
128 "*If non-nil, `add-change-log-entry' will always start a new record." |
88155 | 129 :version "22.1" |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
130 :type 'boolean |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
131 :group 'change-log) |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
132 |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
133 (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
|
134 "*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
|
135 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
|
136 use `buffer-file-name'." |
35936 | 137 :type '(choice (const nil) function) |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
138 :group 'change-log) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
139 |
24289
7917ac967ee5
(add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
23215
diff
changeset
|
140 (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
|
141 "*If non-nil, function to call to identify the filename for a ChangeLog entry. |
27240 | 142 This function is called with one argument, the value of variable |
143 `buffer-file-name' in that buffer. If this is nil, the default is to | |
144 use the file's name relative to the directory of the change log file." | |
35936 | 145 :type '(choice (const nil) function) |
24289
7917ac967ee5
(add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
23215
diff
changeset
|
146 :group 'change-log) |
7917ac967ee5
(add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
23215
diff
changeset
|
147 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
148 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
149 (defcustom change-log-version-info-enabled nil |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
150 "*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
|
151 :version "21.1" |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
152 :type 'boolean |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
153 :group 'change-log) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
154 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
155 (defcustom change-log-version-number-regexp-list |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
156 (let ((re "\\([0-9]+\.[0-9.]+\\)")) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
157 (list |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
158 ;; (defconst ad-version "2.15" |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
159 (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
|
160 ;; Revision: pcl-cvs.el,v 1.72 1999/09/05 20:21:54 monnier Exp |
28446 | 161 (concat "^;+ *Revision: +[^ \t\n]+[ \t]+" re))) |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
162 "*List of regexps to search for version number. |
28446 | 163 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
|
164 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
|
165 :version "21.1" |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
166 :type '(repeat regexp) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
167 :group 'change-log) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
168 |
88155 | 169 (defface change-log-date |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
170 '((t (:inherit font-lock-string-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
171 "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
|
172 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
173 :group 'change-log) |
88155 | 174 ;; backward-compatibility alias |
175 (put 'change-log-date-face 'face-alias 'change-log-date) | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
176 |
88155 | 177 (defface change-log-name |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
178 '((t (:inherit font-lock-constant-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
179 "Face for highlighting author names." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
180 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
181 :group 'change-log) |
88155 | 182 ;; backward-compatibility alias |
183 (put 'change-log-name-face 'face-alias 'change-log-name) | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
184 |
88155 | 185 (defface change-log-email |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
186 '((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
|
187 "Face for highlighting author email addresses." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
188 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
189 :group 'change-log) |
88155 | 190 ;; backward-compatibility alias |
191 (put 'change-log-email-face 'face-alias 'change-log-email) | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
192 |
88155 | 193 (defface change-log-file |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
194 '((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
|
195 "Face for highlighting file names." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
196 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
197 :group 'change-log) |
88155 | 198 ;; backward-compatibility alias |
199 (put 'change-log-file-face 'face-alias 'change-log-file) | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
200 |
88155 | 201 (defface change-log-list |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
202 '((t (:inherit font-lock-keyword-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
203 "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
|
204 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
205 :group 'change-log) |
88155 | 206 ;; backward-compatibility alias |
207 (put 'change-log-list-face 'face-alias 'change-log-list) | |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
208 |
88155 | 209 (defface change-log-conditionals |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
210 '((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
|
211 "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
|
212 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
213 :group 'change-log) |
88155 | 214 ;; backward-compatibility alias |
215 (put 'change-log-conditionals-face 'face-alias 'change-log-conditionals) | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
216 |
88155 | 217 (defface change-log-function |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
218 '((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
|
219 "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
|
220 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
221 :group 'change-log) |
88155 | 222 ;; backward-compatibility alias |
223 (put 'change-log-function-face 'face-alias 'change-log-function) | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
224 |
88155 | 225 (defface change-log-acknowledgement |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
226 '((t (:inherit font-lock-comment-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
227 "Face for highlighting acknowledgments." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
228 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
229 :group 'change-log) |
88155 | 230 ;; backward-compatibility alias |
231 (put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement) | |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
232 |
9377
45228a0f6b78
(change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents:
9347
diff
changeset
|
233 (defvar change-log-font-lock-keywords |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
234 '(;; |
88155 | 235 ;; Date lines, new (2000-01-01) and old (Sat Jan 1 00:00:00 2000) styles. |
236 ;; Fixme: this regepx is just an approximate one and may match | |
237 ;; wrongly with a non-date line existing as a random note. In | |
238 ;; addition, using any kind of fixed setting like this doesn't | |
239 ;; work if a user customizes add-log-time-format. | |
240 ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" | |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
241 (0 'change-log-date-face) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
242 ;; Name and e-mail; some people put e-mail in parens, not angles. |
88155 | 243 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil |
244 (1 'change-log-name) | |
245 (2 'change-log-email))) | |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
246 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
247 ;; File names. |
88155 | 248 ("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)" |
249 (2 'change-log-file) | |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
250 ;; Possibly further names in a list: |
88155 | 251 ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file)) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
252 ;; Possibly a parenthesized list of names: |
88155 | 253 ("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
254 nil nil (1 'change-log-list)) | |
255 ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" | |
256 nil nil (1 'change-log-list))) | |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
257 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
258 ;; Function or variable names. |
88155 | 259 ("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
260 (2 'change-log-list) | |
261 ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil | |
262 (1 'change-log-list))) | |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
263 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
264 ;; Conditionals. |
88155 | 265 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals)) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
266 ;; |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
267 ;; Function of change. |
88155 | 268 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function)) |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
269 ;; |
19439 | 270 ;; Acknowledgements. |
88155 | 271 ;; Don't include plain "From" because that is vague; |
272 ;; we want to encourage people to say something more specific. | |
273 ;; Note that the FSF does not use "Patches by"; our convention | |
274 ;; is to put the name of the author of the changes at the top | |
275 ;; of the change log entry. | |
276 ("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" | |
277 3 'change-log-acknowledgement)) | |
9377
45228a0f6b78
(change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents:
9347
diff
changeset
|
278 "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
|
279 |
88155 | 280 (defvar change-log-mode-map |
281 (let ((map (make-sparse-keymap))) | |
282 (define-key map [?\C-c ?\C-p] 'add-log-edit-prev-comment) | |
283 (define-key map [?\C-c ?\C-n] 'add-log-edit-next-comment) | |
284 map) | |
15889 | 285 "Keymap for Change Log major mode.") |
286 | |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
287 (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
|
288 "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
|
289 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
|
290 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
|
291 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
292 (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
|
293 (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
|
294 (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
|
295 (sec (abs utc-offset)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
296 (ss (% sec 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
297 (min (/ sec 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
298 (mm (% min 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
299 (hh (/ min 60))) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
300 (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
|
301 ((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
|
302 (t "%c%02d")) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
303 sign hh mm ss))) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
304 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
305 (defun add-log-iso8601-time-string () |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
306 (if change-log-time-zone-rule |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
307 (let ((tz (getenv "TZ")) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
308 (now (current-time))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
309 (unwind-protect |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
310 (progn |
30809 | 311 (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
|
312 (concat |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
313 (format-time-string "%Y-%m-%d " now) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
314 (add-log-iso8601-time-zone now))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
315 (set-time-zone-rule tz))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
316 (format-time-string "%Y-%m-%d"))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
317 |
661 | 318 (defun change-log-name () |
27240 | 319 "Return (system-dependent) default name for a change log file." |
661 | 320 (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
|
321 (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
|
322 "$CHANGE_LOG$.TXT" |
9d8b374b5bb1
(change-log-name): Don't treat MSDOS, NT specially.
Richard M. Stallman <rms@gnu.org>
parents:
15909
diff
changeset
|
323 "ChangeLog"))) |
661 | 324 |
88155 | 325 (defun add-log-edit-prev-comment (arg) |
326 "Cycle backward through Log-Edit mode comment history. | |
327 With a numeric prefix ARG, go back ARG comments." | |
328 (interactive "*p") | |
329 (save-restriction | |
330 (narrow-to-region (point) | |
331 (if (memq last-command '(add-log-edit-prev-comment | |
332 add-log-edit-next-comment)) | |
333 (mark) (point))) | |
334 (when (fboundp 'log-edit-previous-comment) | |
335 (log-edit-previous-comment arg) | |
336 (indent-region (point-min) (point-max)) | |
337 (goto-char (point-min)) | |
338 (unless (save-restriction (widen) (bolp)) | |
339 (delete-region (point) (progn (skip-chars-forward " \t\n") (point)))) | |
340 (set-mark (point-min)) | |
341 (goto-char (point-max)) | |
342 (delete-region (point) (progn (skip-chars-backward " \t\n") (point)))))) | |
343 | |
344 (defun add-log-edit-next-comment (arg) | |
345 "Cycle forward through Log-Edit mode comment history. | |
346 With a numeric prefix ARG, go back ARG comments." | |
347 (interactive "*p") | |
348 (add-log-edit-prev-comment (- arg))) | |
349 | |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
350 ;;;###autoload |
661 | 351 (defun prompt-for-change-log-name () |
352 "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
|
353 (let* ((default (change-log-name)) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
354 (name (expand-file-name |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
355 (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
|
356 nil default)))) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
357 ;; 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
|
358 ;; 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
|
359 (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
|
360 (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
|
361 name) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
362 ;; 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
|
363 (if (file-directory-p name) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
364 (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
|
365 (file-name-as-directory name)) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
366 name)))) |
661 | 367 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
368 (defun change-log-version-number-search () |
28446 | 369 "Return version number of current buffer's file. |
370 This is the value returned by `vc-workfile-version' or, if that is | |
371 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
|
372 (let* ((size (buffer-size)) |
88155 | 373 (limit |
28446 | 374 ;; The version number can be anywhere in the file, but |
375 ;; restrict search to the file beginning: 10% should be | |
376 ;; enough to prevent some mishits. | |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
377 ;; |
28446 | 378 ;; Apply percentage only if buffer size is bigger than |
379 ;; approx 100 lines. | |
88155 | 380 (if (> size (* 100 80)) (+ (point) (/ size 10))))) |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
381 (or (and buffer-file-name (vc-workfile-version buffer-file-name)) |
28446 | 382 (save-restriction |
383 (widen) | |
88155 | 384 (let ((regexps change-log-version-number-regexp-list) |
385 version) | |
28446 | 386 (while regexps |
387 (save-excursion | |
388 (goto-char (point-min)) | |
88155 | 389 (when (re-search-forward (pop regexps) limit t) |
28446 | 390 (setq version (match-string 1) |
88155 | 391 regexps nil)))) |
392 version))))) | |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
393 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
394 |
661 | 395 ;;;###autoload |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
396 (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
|
397 "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
|
398 |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
399 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
|
400 If FILE-NAME is nil, use the value of `change-log-default-name'. |
88155 | 401 If `change-log-default-name' is nil, behave as though it were 'ChangeLog' |
9886
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
402 \(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
|
403 |
88155 | 404 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
|
405 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
|
406 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
|
407 |
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
408 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
|
409 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
|
410 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
|
411 ;; 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
|
412 ;; just use that. |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
413 (or file-name |
9886
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
414 (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
|
415 (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
|
416 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
|
417 (progn |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
418 ;; 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
|
419 ;; 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
|
420 (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
|
421 (file-name-directory |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
422 (file-chase-links |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
423 (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
|
424 default-directory)) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
425 (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
|
426 (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
|
427 ;; 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
|
428 ;; 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
|
429 ;; 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
|
430 (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
|
431 (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
|
432 ;; 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
|
433 (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
|
434 parent-dir) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
435 (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
|
436 (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
|
437 (file-name-directory |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
438 (directory-file-name |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
439 (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
|
440 ;; 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
|
441 (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
|
442 parent-dir)))) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
443 ;; 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
|
444 (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
|
445 (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
|
446 parent-dir))) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
447 ;; 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
|
448 (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
|
449 (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
|
450 ;; 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
|
451 (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
|
452 file-name) |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
453 |
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
|
454 (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
|
455 ;; 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
|
456 (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
|
457 (if add-log-file-name-function |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
458 (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
|
459 (setq buffer-file |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
460 (if (string-match |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
461 (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
|
462 buffer-file) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
463 (substring buffer-file (match-end 0)) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
464 (file-name-nondirectory buffer-file))) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
465 ;; 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
|
466 ;; 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
|
467 ;; 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
|
468 (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
|
469 (file-name-sans-versions buffer-file) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
470 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
|
471 |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
472 ;;;###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
|
473 (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
|
474 "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
|
475 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user |
88155 | 476 name and email (stored in `add-log-full-name' and `add-log-mailing-address'). |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
477 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
478 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
|
479 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
|
480 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
481 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
|
482 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
483 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
|
484 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
|
485 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
|
486 |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
487 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
|
488 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
|
489 the same person. |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
490 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
491 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
|
492 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
|
493 notices. |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
494 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
495 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
|
496 non-nil, otherwise in local time." |
661 | 497 (interactive (list current-prefix-arg |
498 (prompt-for-change-log-name))) | |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
499 (let* ((defun (add-log-current-defun)) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
500 (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
|
501 (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
|
502 (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
|
503 (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
|
504 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
|
505 (buffer-file (if buf-file-name (expand-file-name buf-file-name))) |
88155 | 506 (file-name (expand-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
|
507 ;; 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
|
508 (item (add-log-file-name buffer-file file-name)) |
88155 | 509 bound |
510 (full-name (or add-log-full-name (user-full-name))) | |
511 (mailing-address (or add-log-mailing-address user-mail-address))) | |
512 | |
513 (if whoami | |
514 (progn | |
515 (setq full-name (read-string "Full name: " full-name)) | |
516 ;; Note that some sites have room and phone number fields in | |
517 ;; full name which look silly when inserted. Rather than do | |
518 ;; anything about that here, let user give prefix argument so that | |
519 ;; s/he can edit the full name field in prompter if s/he wants. | |
520 (setq mailing-address | |
521 (read-string "Mailing address: " mailing-address)))) | |
1727
d6cc12c97a59
(add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents:
1644
diff
changeset
|
522 |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
523 (unless (equal file-name buffer-file-name) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
524 (if (or other-window (window-dedicated-p (selected-window))) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
525 (find-file-other-window file-name) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
526 (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
|
527 (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
|
528 (change-log-mode)) |
661 | 529 (undo-boundary) |
530 (goto-char (point-min)) | |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
531 |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
532 ;; 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
|
533 ;; 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
|
534 (when (looking-at "Copyright") |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
535 (search-forward "\n\n") |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
536 (skip-chars-forward "\n")) |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
537 |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
538 ;; Advance into first entry if it is usable; else make new one. |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
539 (let ((new-entries (mapcar (lambda (addr) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
540 (concat (funcall add-log-time-format) |
88155 | 541 " " full-name |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
542 " <" addr ">")) |
88155 | 543 (if (consp mailing-address) |
544 mailing-address | |
545 (list mailing-address))))) | |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
546 (if (and (not add-log-always-start-new-record) |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
547 (let ((hit nil)) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
548 (dolist (entry new-entries hit) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
549 (when (looking-at (regexp-quote entry)) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
550 (setq hit t))))) |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
551 (forward-line 1) |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
552 (insert (nth (random (length new-entries)) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
553 new-entries) |
88155 | 554 (if use-hard-newlines hard-newline "\n") |
555 (if use-hard-newlines hard-newline "\n")) | |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
556 (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
|
557 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
558 ;; 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
|
559 ;; 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
|
560 (setq bound |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
561 (save-excursion |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
562 (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
|
563 (skip-chars-forward "\n") |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
564 (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
|
565 (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
|
566 (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
|
567 (point))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
568 |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
569 ;; 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
|
570 (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
|
571 ;; 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
|
572 (if item |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
573 (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
|
574 ((and (not new-entry) |
12551
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
575 (let (case-fold-search) |
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
576 (re-search-forward |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
577 (concat (regexp-quote (concat "* " item)) |
12551
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
578 ;; Don't accept `foo.bar' when |
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
579 ;; looking for `foo': |
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
580 "\\(\\s \\|[(),:]\\)") |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
581 bound t))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
582 ;; 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
|
583 (re-search-forward "^\\s *$\\|^\\s \\*") |
12551
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
584 (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
|
585 ;; 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
|
586 (while (and (not (eobp)) (looking-at "^\\s *$")) |
28446 | 587 (delete-region (point) (line-beginning-position 2))) |
88155 | 588 (insert (if use-hard-newlines hard-newline "\n") |
589 (if use-hard-newlines hard-newline "\n")) | |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
590 (forward-line -2) |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
591 (indent-relative-maybe)) |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
592 (t |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
593 ;; Make a new item. |
678 | 594 (while (looking-at "\\sW") |
595 (forward-line 1)) | |
912
1c37c99856de
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
596 (while (and (not (eobp)) (looking-at "^\\s *$")) |
28446 | 597 (delete-region (point) (line-beginning-position 2))) |
88155 | 598 (insert (if use-hard-newlines hard-newline "\n") |
599 (if use-hard-newlines hard-newline "\n") | |
600 (if use-hard-newlines hard-newline "\n")) | |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
811
diff
changeset
|
601 (forward-line -2) |
678 | 602 (indent-to left-margin) |
30809 | 603 (insert "* ") |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
604 (if item (insert item)))) |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
811
diff
changeset
|
605 ;; 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
|
606 ;; Point is at the item for this file, |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
607 ;; either at the end of the line or at the first blank line. |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
608 (if (not defun) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
609 ;; No function name, so put in a colon unless we have just a star. |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
610 (unless (save-excursion |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
611 (beginning-of-line 1) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
612 (looking-at "\\s *\\(\\*\\s *\\)?$")) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
613 (insert ": ") |
88155 | 614 (if version (insert version ?\s))) |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
615 ;; Make it easy to get rid of the function name. |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
616 (undo-boundary) |
28446 | 617 (unless (save-excursion |
618 (beginning-of-line 1) | |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
619 (looking-at "\\s *$")) |
88155 | 620 (insert ?\s)) |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
621 ;; See if the prev function name has a message yet or not. |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
622 ;; If not, merge the two items. |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
623 (let ((pos (point-marker))) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
624 (skip-syntax-backward " ") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
625 (skip-chars-backward "):") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
626 (if (and (looking-at "):") |
88155 | 627 (let ((pos (save-excursion (backward-sexp 1) (point)))) |
628 (when (equal (buffer-substring pos (point)) defun) | |
629 (delete-region pos (point))) | |
630 (> fill-column (+ (current-column) (length defun) 4)))) | |
631 (progn (skip-chars-backward ", ") | |
632 (delete-region (point) pos) | |
633 (unless (memq (char-before) '(?\()) (insert ", "))) | |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
634 (if (looking-at "):") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
635 (delete-region (+ 1 (point)) (line-end-position))) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
636 (goto-char pos) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
637 (insert "(")) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
638 (set-marker pos nil)) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
639 (insert defun "): ") |
88155 | 640 (if version (insert version ?\s))))) |
661 | 641 |
642 ;;;###autoload | |
643 (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
|
644 "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
|
645 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
|
646 the change log file in another window." |
661 | 647 (interactive (if current-prefix-arg |
648 (list current-prefix-arg | |
649 (prompt-for-change-log-name)))) | |
650 (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
|
651 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) |
661 | 652 |
88155 | 653 (defvar add-log-indent-text 0) |
654 | |
655 (defun add-log-indent () | |
656 (let* ((indent | |
657 (save-excursion | |
658 (beginning-of-line) | |
659 (skip-chars-forward " \t") | |
660 (cond | |
661 ((and (looking-at "\\(.*\\) [^ \n].*[^ \n] <.*>$") | |
662 ;; Matching the output of add-log-time-format is difficult, | |
663 ;; but I'll get it has at least two adjacent digits. | |
664 (string-match "[[:digit:]][[:digit:]]" (match-string 1))) | |
665 0) | |
666 ((looking-at "[^*(]") | |
667 (+ (current-left-margin) add-log-indent-text)) | |
668 (t (current-left-margin))))) | |
669 (pos (save-excursion (indent-line-to indent) (point)))) | |
670 (if (> pos (point)) (goto-char pos)))) | |
671 | |
672 | |
673 (defvar smerge-resolve-function) | |
674 | |
980
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
675 ;;;###autoload |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
676 (define-derived-mode change-log-mode text-mode "Change Log" |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3499
diff
changeset
|
677 "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
|
678 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
|
679 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window]. |
951 | 680 Each entry behaves as a paragraph, and the entries for one day as a page. |
88155 | 681 Runs `change-log-mode-hook'. |
682 \\{change-log-mode-map}" | |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
683 (setq left-margin 8 |
13706
ba34746d66fd
(change-log-mode): Defaults for `indent-tabs-mode'
Karl Heuer <kwzh@gnu.org>
parents:
13648
diff
changeset
|
684 fill-column 74 |
15887
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
685 indent-tabs-mode t |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
686 tab-width 8) |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
687 (set (make-local-variable 'fill-paragraph-function) |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
688 'change-log-fill-paragraph) |
88155 | 689 (set (make-local-variable 'indent-line-function) 'add-log-indent) |
690 (set (make-local-variable 'tab-always-indent) nil) | |
21719
c888284a54f7
(change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents:
21629
diff
changeset
|
691 ;; 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
|
692 ;; 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
|
693 ;; 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
|
694 ;; between entries for different files. |
21749
84df514f7719
(change-log-mode): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
21719
diff
changeset
|
695 (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
|
696 (set (make-local-variable 'paragraph-separate) paragraph-start) |
1078
15b4ed20e524
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1062
diff
changeset
|
697 ;; 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
|
698 ;; 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
|
699 (set (make-local-variable 'page-delimiter) "^\\<\\|^\f") |
678 | 700 (set (make-local-variable 'version-control) 'never) |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
701 (set (make-local-variable 'smerge-resolve-function) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
702 'change-log-resolve-conflict) |
678 | 703 (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
|
704 (set (make-local-variable 'font-lock-defaults) |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
705 '(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
|
706 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
707 ;; 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
|
708 ;; 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
|
709 ;; 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
|
710 ;; 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
|
711 (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
|
712 "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
|
713 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
|
714 (interactive "P") |
16505
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
715 (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
|
716 (beg (progn (backward-paragraph) (point))) |
13505
86470b361571
(change-log-mode): Remove incorrect "^" anchors from
Richard M. Stallman <rms@gnu.org>
parents:
13282
diff
changeset
|
717 (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
|
718 (fill-region beg end justify) |
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
719 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
|
720 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
721 (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
|
722 "^\\([[: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
|
723 "*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
|
724 :type 'regexp |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
725 :group 'change-log) |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
726 |
6562
0541a368505c
(add-log-current-defun): Autoload this.
Roland McGrath <roland@gnu.org>
parents:
6309
diff
changeset
|
727 ;;;###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
|
728 (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
|
729 '(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
|
730 "*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
|
731 |
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
|
732 ;;;###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
|
733 (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
|
734 '(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
|
735 "*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
|
736 |
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
|
737 ;;;###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
|
738 (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
|
739 '(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
|
740 "*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
|
741 |
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
|
742 ;;;###autoload |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
743 (defun add-log-current-defun () |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
744 "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
|
745 |
3499
6428162f137c
(add-log-current-defun): Fix typos in last change.
Richard M. Stallman <rms@gnu.org>
parents:
3486
diff
changeset
|
746 Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...), |
28446 | 747 Texinfo (@node titles) and Perl. |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
748 |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
749 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
|
750 point for uppercase headings starting in the first column or |
28446 | 751 identifiers followed by `:' or `='. See variables |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
752 `add-log-current-defun-header-regexp' and |
46637
f0f715e7aabc
(add-log-current-defun): Fix typo in documentation.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
46632
diff
changeset
|
753 `add-log-current-defun-function'. |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
754 |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
755 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
|
756 (condition-case nil |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
757 (save-excursion |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
758 (let ((location (point))) |
28446 | 759 (cond (add-log-current-defun-function |
760 (funcall add-log-current-defun-function)) | |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
761 ((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
|
762 ;; 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
|
763 ;; 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
|
764 ;; rather than the previous one. |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
765 (or (eobp) (forward-char 1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
766 (beginning-of-defun) |
28446 | 767 ;; Make sure we are really inside the defun found, |
768 ;; not after it. | |
21944
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
769 (when (and (looking-at "\\s(") |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
770 (progn (end-of-defun) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
771 (< location (point))) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
772 (progn (forward-sexp -1) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
773 (>= location (point)))) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
774 (if (looking-at "\\s(") |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
775 (forward-char 1)) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
776 ;; Skip the defining construct name, typically "defun" |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
777 ;; or "defvar". |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
778 (forward-sexp 1) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
779 ;; 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
|
780 ;; If it is not, use the first symbol in it. |
22018 | 781 (skip-chars-forward " \t\n'(") |
28446 | 782 (buffer-substring-no-properties (point) |
783 (progn (forward-sexp 1) | |
784 (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
|
785 ((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
|
786 (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
|
787 (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
|
788 ;; 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
|
789 ;; 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
|
790 ;; 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
|
791 (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
|
792 (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
|
793 (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
|
794 ;; Handle a C macro definition. |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
795 (beginning-of-line) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
796 (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
|
797 (forward-line -1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
798 (search-forward "define") |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
799 (skip-chars-forward " \t") |
28446 | 800 (buffer-substring-no-properties (point) |
801 (progn (forward-sexp 1) | |
802 (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
|
803 ((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
|
804 (beginning-of-line) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
805 ;; 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
|
806 ;; 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
|
807 (while (not (looking-at "{\\|\\(\\s *$\\)")) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
808 (forward-line 1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
809 (or (eobp) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
810 (forward-char 1)) |
88155 | 811 (let (maybe-beg) |
812 ;; Try to find the containing defun. | |
813 (beginning-of-defun) | |
814 (end-of-defun) | |
815 ;; If the defun we found ends before the desired position, | |
816 ;; see if there's a DEFUN construct | |
817 ;; between that end and the desired position. | |
818 (when (save-excursion | |
819 (and (> location (point)) | |
820 (re-search-forward "^DEFUN" | |
821 (save-excursion | |
822 (goto-char location) | |
823 (line-end-position)) | |
824 t) | |
825 (re-search-forward "^{" nil t) | |
826 (setq maybe-beg (point)))) | |
827 ;; If so, go to the end of that instead. | |
828 (goto-char maybe-beg) | |
829 (end-of-defun))) | |
830 ;; If the desired position is within the defun we found, | |
831 ;; find the function name. | |
832 (when (< location (point)) | |
833 ;; Move back over function body. | |
28446 | 834 (backward-sexp 1) |
88155 | 835 (let (beg) |
836 ;; Skip back over typedefs and arglist. | |
837 ;; Stop at the function definition itself | |
838 ;; or at the line that follows end of function doc string. | |
28446 | 839 (forward-line -1) |
840 (while (and (not (bobp)) | |
88155 | 841 (looking-at "[ \t\n]") |
842 (not (looking-back "[*]/)\n" (- (point) 4)))) | |
28446 | 843 (forward-line -1)) |
88155 | 844 ;; If we found a doc string, this must be the DEFUN macro |
845 ;; used in Emacs. Move back to the DEFUN line. | |
846 (when (looking-back "[*]/)\n" (- (point) 4)) | |
847 (backward-sexp 1) | |
848 (beginning-of-line)) | |
849 ;; Is this a DEFUN construct? And is LOCATION in it? | |
850 (if (and (looking-at "DEFUN\\b") | |
851 (>= location (point))) | |
852 ;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory | |
853 ;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK | |
28446 | 854 (progn |
855 (down-list 1) | |
88155 | 856 (when (= (char-after (point)) ?\") |
857 (forward-sexp 1) | |
858 (search-forward ",")) | |
859 (skip-syntax-forward " ") | |
28446 | 860 (buffer-substring-no-properties |
861 (point) | |
88155 | 862 (progn (search-forward ",") |
863 (forward-char -1) | |
864 (skip-syntax-backward " ") | |
28446 | 865 (point)))) |
866 (if (looking-at "^[+-]") | |
88155 | 867 ;; Objective-C |
28446 | 868 (change-log-get-method-definition) |
869 ;; Ordinary C function syntax. | |
870 (setq beg (point)) | |
871 (if (and | |
872 ;; Protect against "Unbalanced parens" error. | |
873 (condition-case nil | |
874 (progn | |
875 (down-list 1) ; into arglist | |
876 (backward-up-list 1) | |
877 (skip-chars-backward " \t") | |
878 t) | |
879 (error nil)) | |
880 ;; Verify initial pos was after | |
881 ;; real start of function. | |
882 (save-excursion | |
883 (goto-char beg) | |
884 ;; For this purpose, include the line | |
885 ;; that has the decl keywords. This | |
886 ;; may also include some of the | |
887 ;; comments before the function. | |
888 (while (and (not (bobp)) | |
889 (save-excursion | |
890 (forward-line -1) | |
891 (looking-at "[^\n\f]"))) | |
892 (forward-line -1)) | |
893 (>= location (point))) | |
894 ;; Consistency check: going down and up | |
895 ;; shouldn't take us back before BEG. | |
896 (> (point) beg)) | |
897 (let (end middle) | |
898 ;; Don't include any final whitespace | |
899 ;; in the name we use. | |
900 (skip-chars-backward " \t\n") | |
901 (setq end (point)) | |
902 (backward-sexp 1) | |
903 ;; Now find the right beginning of the name. | |
904 ;; Include certain keywords if they | |
905 ;; precede the name. | |
906 (setq middle (point)) | |
907 (forward-word -1) | |
88155 | 908 ;; Is this C++ method? |
909 (when (and (< 2 middle) | |
910 (string= (buffer-substring (- middle 2) | |
911 middle) | |
912 "::")) | |
913 ;; Include "classname::". | |
914 (setq middle (point))) | |
28446 | 915 ;; Ignore these subparts of a class decl |
916 ;; and move back to the class name itself. | |
917 (while (looking-at "public \\|private ") | |
918 (skip-chars-backward " \t:") | |
919 (setq end (point)) | |
920 (backward-sexp 1) | |
921 (setq middle (point)) | |
922 (forward-word -1)) | |
923 (and (bolp) | |
924 (looking-at | |
925 "enum \\|struct \\|union \\|class ") | |
926 (setq middle (point))) | |
927 (goto-char end) | |
928 (when (eq (preceding-char) ?=) | |
929 (forward-char -1) | |
930 (skip-chars-backward " \t") | |
931 (setq end (point))) | |
932 (buffer-substring-no-properties | |
933 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
|
934 ((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
|
935 (if (re-search-backward |
28446 | 936 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" |
937 nil t) | |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
938 (progn |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
939 (goto-char (match-beginning 0)) |
28446 | 940 (buffer-substring-no-properties |
941 (1+ (point)) ; without initial backslash | |
942 (line-end-position))))) | |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
943 ((eq major-mode 'texinfo-mode) |
9397
eba13d81ba0b
(add-log-current-defun): In texinfo-mode,
Richard M. Stallman <rms@gnu.org>
parents:
9377
diff
changeset
|
944 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t) |
28446 | 945 (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
|
946 ((memq major-mode '(perl-mode cperl-mode)) |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
947 (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t) |
28446 | 948 (match-string-no-properties 1))) |
949 ;; Emacs's autoconf-mode installs its own | |
950 ;; `add-log-current-defun-function'. This applies to | |
951 ;; a different mode apparently for editing .m4 | |
952 ;; autoconf source. | |
27945
c11a0bbb5c88
(add-log-current-defun): Add support for
Gerd Moellmann <gerd@gnu.org>
parents:
27310
diff
changeset
|
953 ((eq major-mode 'autoconf-mode) |
28446 | 954 (if (re-search-backward |
955 "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t) | |
956 (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
|
957 (t |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
958 ;; If all else fails, try heuristics |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
959 (let (case-fold-search |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
960 result) |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
961 (end-of-line) |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
962 (when (re-search-backward |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
963 add-log-current-defun-header-regexp |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
964 (- (point) 10000) |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
965 t) |
28446 | 966 (setq result (or (match-string-no-properties 1) |
967 (match-string-no-properties 0))) | |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
968 ;; Strip whitespace away |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
969 (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
|
970 result) |
28446 | 971 (setq result (match-string-no-properties 1 result))) |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
972 result)))))) |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
973 (error nil))) |
999 | 974 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
975 (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
|
976 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
977 ;; 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
|
978 ;; 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
|
979 ;; 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
|
980 (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
|
981 (setq change-log-get-method-definition-md |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
982 (concat change-log-get-method-definition-md |
28446 | 983 (match-string 1) |
13282
69fe836d7f02
(get-method-definition, get-method-definition-1):
Richard M. Stallman <rms@gnu.org>
parents:
13255
diff
changeset
|
984 end)) |
11749
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
985 (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
|
986 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
987 (defun change-log-get-method-definition () |
88155 | 988 "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
|
989 (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
|
990 (save-excursion |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
991 (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
|
992 (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
|
993 (save-excursion |
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
994 (cond |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
995 ((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
|
996 (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
|
997 (while (not (looking-at "[{;]")) |
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
998 (looking-at |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
999 "\\([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
|
1000 (change-log-get-method-definition-1 "")) |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
1001 (concat change-log-get-method-definition-md "]")))))) |
27240 | 1002 |
1003 (defun change-log-sortable-date-at () | |
1004 "Return date of log entry in a consistent form for sorting. | |
1005 Point is assumed to be at the start of the entry." | |
1006 (require 'timezone) | |
1007 (if (looking-at "^\\sw.........[0-9:+ ]*") | |
1008 (let ((date (match-string-no-properties 0))) | |
1009 (if date | |
1010 (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date) | |
1011 (concat (match-string 1 date) (match-string 2 date) | |
1012 (match-string 3 date)) | |
1013 (condition-case nil | |
1014 (timezone-make-date-sortable date) | |
1015 (error nil))))) | |
1016 (error "Bad date"))) | |
11749
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
1017 |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1018 (defun change-log-resolve-conflict () |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1019 "Function to be used in `smerge-resolve-function'." |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1020 (let ((buf (current-buffer))) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1021 (with-temp-buffer |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1022 (insert-buffer-substring buf (match-beginning 1) (match-end 1)) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1023 (save-match-data (change-log-mode)) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1024 (let ((other-buf (current-buffer))) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1025 (with-current-buffer buf |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1026 (save-excursion |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1027 (save-restriction |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1028 (narrow-to-region (match-beginning 0) (match-end 0)) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1029 (replace-match (match-string 3) t t) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1030 (change-log-merge other-buf)))))))) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1031 |
27240 | 1032 ;;;###autoload |
1033 (defun change-log-merge (other-log) | |
88155 | 1034 "Merge the contents of change log file OTHER-LOG with this buffer. |
27240 | 1035 Both must be found in Change Log mode (since the merging depends on |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1036 the appropriate motion commands). OTHER-LOG can be either a file name |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1037 or a buffer. |
27240 | 1038 |
30809 | 1039 Entries are inserted in chronological order. Both the current and |
1040 old-style time formats for entries are supported." | |
27240 | 1041 (interactive "*fLog file name to merge: ") |
1042 (if (not (eq major-mode 'change-log-mode)) | |
1043 (error "Not in Change Log mode")) | |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1044 (let ((other-buf (if (bufferp other-log) other-log |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1045 (find-file-noselect other-log))) |
27240 | 1046 (buf (current-buffer)) |
1047 date1 start end) | |
1048 (save-excursion | |
1049 (goto-char (point-min)) | |
1050 (set-buffer other-buf) | |
1051 (goto-char (point-min)) | |
1052 (if (not (eq major-mode 'change-log-mode)) | |
1053 (error "%s not found in Change Log mode" other-log)) | |
1054 ;; Loop through all the entries in OTHER-LOG. | |
1055 (while (not (eobp)) | |
1056 (setq date1 (change-log-sortable-date-at)) | |
1057 (setq start (point) | |
1058 end (progn (forward-page) (point))) | |
1059 ;; Look for an entry in original buffer that isn't later. | |
1060 (with-current-buffer buf | |
1061 (while (and (not (eobp)) | |
1062 (string< date1 (change-log-sortable-date-at))) | |
1063 (forward-page)) | |
1064 (if (not (eobp)) | |
1065 (insert-buffer-substring other-buf start end) | |
1066 ;; At the end of the original buffer, insert a newline to | |
1067 ;; separate entries and then the rest of the file being | |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1068 ;; merged. |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1069 (unless (or (bobp) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1070 (and (= ?\n (char-before)) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1071 (or (<= (1- (point)) (point-min)) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1072 (= ?\n (char-before (1- (point))))))) |
88155 | 1073 (insert (if use-hard-newlines hard-newline "\n"))) |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1074 ;; Move to the end of it to terminate outer loop. |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1075 (with-current-buffer other-buf |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1076 (goto-char (point-max))) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1077 (insert-buffer-substring other-buf start))))))) |
999 | 1078 |
30809 | 1079 ;;;###autoload |
1080 (defun change-log-redate () | |
1081 "Fix any old-style date entries in the current log file to default format." | |
1082 (interactive) | |
1083 (require 'timezone) | |
1084 (save-excursion | |
1085 (goto-char (point-min)) | |
1086 (while (re-search-forward "^\\sw.........[0-9:+ ]*" nil t) | |
1087 (unless (= 12 (- (match-end 0) (match-beginning 0))) | |
1088 (let* ((date (save-match-data | |
1089 (timezone-fix-time (match-string 0) nil nil))) | |
1090 (zone (if (consp (aref date 6)) | |
1091 (nth 1 (aref date 6))))) | |
1092 (replace-match (format-time-string | |
1093 "%Y-%m-%d " | |
1094 (encode-time (aref date 5) | |
1095 (aref date 4) | |
1096 (aref date 3) | |
1097 (aref date 2) | |
1098 (aref date 1) | |
1099 (aref date 0) | |
1100 zone)))))))) | |
1101 | |
980
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
1102 (provide 'add-log) |
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
1103 |
88155 | 1104 ;;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
678
diff
changeset
|
1105 ;;; add-log.el ends here |