Mercurial > emacs
annotate lisp/add-log.el @ 51798:04564d8f3be9
(browse-url-browser-function): Add alternative for Epiphany.
(browse-url-epiphany-program, browse-url-epiphany-arguments)
(browse-url-epiphany-startup-arguments)
(browse-url-epiphany-new-window-is-tab): New variables.
(browse-url-epiphany, browse-url-epiphany-sentinel): New functions.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 07 Jul 2003 20:54:56 +0000 |
parents | d9592ff1371e |
children | 695cf19ef79e |
rev | line source |
---|---|
22388 | 1 ;;; add-log.el --- change log maintenance commands for Emacs |
661 | 2 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
3 ;; Copyright (C) 1985, 86, 88, 93, 94, 97, 98, 2000, 2003 |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
4 ;; 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 |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, 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 |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
36 "Change log maintenance" |
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 |
50641
7ae78cd3ce2e
(add-log-current-defun-function): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
50575
diff
changeset
|
54 ;; Many modes set this variable, so avoid warnings. |
7ae78cd3ce2e
(add-log-current-defun-function): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
50575
diff
changeset
|
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 |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
73 "*Electronic mail addresses of user, for inclusion in ChangeLog headers. |
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." |
45255
20c79f08a7da
Change all post-21.1 :version attributes to 21.4.
Eli Zaretskii <eliz@gnu.org>
parents:
40315
diff
changeset
|
129 :version "21.4" |
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 |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
169 (defface change-log-date-face |
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) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
174 |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
175 (defface change-log-name-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
176 '((t (:inherit font-lock-constant-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
177 "Face for highlighting author names." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
178 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
179 :group 'change-log) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
180 |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
181 (defface change-log-email-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
182 '((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
|
183 "Face for highlighting author email addresses." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
184 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
185 :group 'change-log) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
186 |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
187 (defface change-log-file-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
188 '((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
|
189 "Face for highlighting file names." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
190 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
191 :group 'change-log) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
192 |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
193 (defface change-log-list-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
194 '((t (:inherit font-lock-keyword-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
195 "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
|
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) |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
198 |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
199 (defface change-log-conditionals-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
200 '((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
|
201 "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
|
202 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
203 :group 'change-log) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
204 |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
205 (defface change-log-function-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
206 '((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
|
207 "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
|
208 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
209 :group 'change-log) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
210 |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
211 (defface change-log-acknowledgement-face |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
212 '((t (:inherit font-lock-comment-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
213 "Face for highlighting acknowledgments." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
214 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
215 :group 'change-log) |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
216 |
9377
45228a0f6b78
(change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents:
9347
diff
changeset
|
217 (defvar change-log-font-lock-keywords |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
218 '(;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
219 ;; Date lines, new and old styles. |
21009
f3149849a051
(change-log-font-lock-keywords): Recognize + in date.
Richard M. Stallman <rms@gnu.org>
parents:
20953
diff
changeset
|
220 ("^\\sw.........[0-9:+ ]*" |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
221 (0 'change-log-date-face) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
222 ;; Name and e-mail; some people put e-mail in parens, not angles. |
31720
601145997e91
(change-log-font-lock-keywords): Match names
Gerd Moellmann <gerd@gnu.org>
parents:
30809
diff
changeset
|
223 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
224 (1 'change-log-name-face) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
225 (2 'change-log-email-face))) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
226 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
227 ;; File names. |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
228 ("^\t\\* \\([^ ,:([\n]+\\)" |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
229 (1 'change-log-file-face) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
230 ;; Possibly further names in a list: |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
231 ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face)) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
232 ;; Possibly a parenthesized list of names: |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
233 ("\\= (\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face)) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
234 ("\\=, *\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face))) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
235 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
236 ;; Function or variable names. |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
237 ("^\t(\\([^) ,:\n]+\\)" |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
238 (1 'change-log-list-face) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
239 ("\\=, *\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face))) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
240 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
241 ;; Conditionals. |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
242 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals-face)) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
243 ;; |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
244 ;; Function of change. |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
245 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face)) |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
246 ;; |
19439 | 247 ;; Acknowledgements. |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
248 ("\\(^\t\\| \\)\\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
249 2 'change-log-acknowledgement-face)) |
9377
45228a0f6b78
(change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents:
9347
diff
changeset
|
250 "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
|
251 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
252 (defvar change-log-mode-map |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
253 (let ((map (make-sparse-keymap))) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
254 (define-key map [?\C-c ?\C-p] 'add-log-edit-prev-comment) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
255 (define-key map [?\C-c ?\C-n] 'add-log-edit-next-comment) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
256 map) |
15889 | 257 "Keymap for Change Log major mode.") |
258 | |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
259 (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
|
260 "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
|
261 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
|
262 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
|
263 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
264 (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
|
265 (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
|
266 (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
|
267 (sec (abs utc-offset)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
268 (ss (% sec 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
269 (min (/ sec 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
270 (mm (% min 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
271 (hh (/ min 60))) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
272 (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
|
273 ((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
|
274 (t "%c%02d")) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
275 sign hh mm ss))) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
276 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
277 (defun add-log-iso8601-time-string () |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
278 (if change-log-time-zone-rule |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
279 (let ((tz (getenv "TZ")) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
280 (now (current-time))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
281 (unwind-protect |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
282 (progn |
30809 | 283 (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
|
284 (concat |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
285 (format-time-string "%Y-%m-%d " now) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
286 (add-log-iso8601-time-zone now))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
287 (set-time-zone-rule tz))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
288 (format-time-string "%Y-%m-%d"))) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
289 |
661 | 290 (defun change-log-name () |
27240 | 291 "Return (system-dependent) default name for a change log file." |
661 | 292 (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
|
293 (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
|
294 "$CHANGE_LOG$.TXT" |
9d8b374b5bb1
(change-log-name): Don't treat MSDOS, NT specially.
Richard M. Stallman <rms@gnu.org>
parents:
15909
diff
changeset
|
295 "ChangeLog"))) |
661 | 296 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
297 (defun add-log-edit-prev-comment (arg) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
298 "Cycle backward through Log-Edit mode comment history. |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
299 With a numeric prefix ARG, go back ARG comments." |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
300 (interactive "*p") |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
301 (save-restriction |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
302 (narrow-to-region (point) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
303 (if (memq last-command '(add-log-edit-prev-comment |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
304 add-log-edit-next-comment)) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
305 (mark) (point))) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
306 (when (fboundp 'log-edit-previous-comment) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
307 (log-edit-previous-comment arg) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
308 (indent-region (point-min) (point-max)) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
309 (goto-char (point-min)) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
310 (unless (save-restriction (widen) (bolp)) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
311 (delete-region (point) (progn (skip-chars-forward " \t\n") (point)))) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
312 (set-mark (point-min)) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
313 (goto-char (point-max)) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
314 (delete-region (point) (progn (skip-chars-backward " \t\n") (point)))))) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
315 |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
316 (defun add-log-edit-next-comment (arg) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
317 "Cycle forward through Log-Edit mode comment history. |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
318 With a numeric prefix ARG, go back ARG comments." |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
319 (interactive "*p") |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
320 (add-log-edit-prev-comment (- arg))) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
321 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
322 ;;;###autoload |
661 | 323 (defun prompt-for-change-log-name () |
324 "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
|
325 (let* ((default (change-log-name)) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
326 (name (expand-file-name |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
327 (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
|
328 nil default)))) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
329 ;; 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
|
330 ;; 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
|
331 (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
|
332 (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
|
333 name) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
334 ;; 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
|
335 (if (file-directory-p name) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
336 (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
|
337 (file-name-as-directory name)) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
338 name)))) |
661 | 339 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
340 (defun change-log-version-number-search () |
28446 | 341 "Return version number of current buffer's file. |
342 This is the value returned by `vc-workfile-version' or, if that is | |
343 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
|
344 (let* ((size (buffer-size)) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
345 (limit |
28446 | 346 ;; The version number can be anywhere in the file, but |
347 ;; restrict search to the file beginning: 10% should be | |
348 ;; enough to prevent some mishits. | |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
349 ;; |
28446 | 350 ;; Apply percentage only if buffer size is bigger than |
351 ;; approx 100 lines. | |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
352 (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
|
353 (or (and buffer-file-name (vc-workfile-version buffer-file-name)) |
28446 | 354 (save-restriction |
355 (widen) | |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
356 (let ((regexps change-log-version-number-regexp-list) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
357 version) |
28446 | 358 (while regexps |
359 (save-excursion | |
360 (goto-char (point-min)) | |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
361 (when (re-search-forward (pop regexps) limit t) |
28446 | 362 (setq version (match-string 1) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
363 regexps nil)))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
364 version))))) |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
365 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
366 |
661 | 367 ;;;###autoload |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
368 (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
|
369 "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
|
370 |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
371 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
|
372 If FILE-NAME is nil, use the value of `change-log-default-name'. |
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
373 If 'change-log-default-name' is nil, behave as though it were 'ChangeLog' |
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
374 \(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
|
375 |
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
376 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
|
377 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
|
378 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
|
379 |
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
380 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
|
381 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
|
382 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
|
383 ;; 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
|
384 ;; just use that. |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
385 (or file-name |
9886
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
386 (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
|
387 (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
|
388 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
|
389 (progn |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
390 ;; 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
|
391 ;; 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
|
392 (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
|
393 (file-name-directory |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
394 (file-chase-links |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
395 (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
|
396 default-directory)) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
397 (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
|
398 (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
|
399 ;; 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
|
400 ;; 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
|
401 ;; 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
|
402 (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
|
403 (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
|
404 ;; 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
|
405 (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
|
406 parent-dir) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
407 (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
|
408 (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
|
409 (file-name-directory |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
410 (directory-file-name |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
411 (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
|
412 ;; 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
|
413 (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
|
414 parent-dir)))) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
415 ;; 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
|
416 (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
|
417 (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
|
418 parent-dir))) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
419 ;; 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
|
420 (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
|
421 (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
|
422 ;; 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
|
423 (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
|
424 file-name) |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
425 |
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
|
426 (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
|
427 ;; 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
|
428 (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
|
429 (if add-log-file-name-function |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
430 (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
|
431 (setq buffer-file |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
432 (if (string-match |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
433 (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
|
434 buffer-file) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
435 (substring buffer-file (match-end 0)) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
436 (file-name-nondirectory buffer-file))) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
437 ;; 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
|
438 ;; 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
|
439 ;; 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
|
440 (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
|
441 (file-name-sans-versions buffer-file) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
442 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
|
443 |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
444 ;;;###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
|
445 (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
|
446 "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
|
447 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
448 name and site. |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
449 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
450 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
|
451 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
|
452 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
453 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
|
454 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
455 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
|
456 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
|
457 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
|
458 |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
459 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
|
460 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
|
461 the same person. |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
462 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
463 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
|
464 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
|
465 notices. |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
466 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
467 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
|
468 non-nil, otherwise in local time." |
661 | 469 (interactive (list current-prefix-arg |
470 (prompt-for-change-log-name))) | |
13648
ce23ae11d3fa
(add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents:
13505
diff
changeset
|
471 (or add-log-full-name |
ce23ae11d3fa
(add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents:
13505
diff
changeset
|
472 (setq add-log-full-name (user-full-name))) |
ce23ae11d3fa
(add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents:
13505
diff
changeset
|
473 (or add-log-mailing-address |
ce23ae11d3fa
(add-change-log-entry): Initialize add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents:
13505
diff
changeset
|
474 (setq add-log-mailing-address user-mail-address)) |
4741
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
475 (if whoami |
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
476 (progn |
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
477 (setq add-log-full-name (read-input "Full name: " add-log-full-name)) |
661 | 478 ;; Note that some sites have room and phone number fields in |
479 ;; full name which look silly when inserted. Rather than do | |
480 ;; anything about that here, let user give prefix argument so that | |
481 ;; s/he can edit the full name field in prompter if s/he wants. | |
4741
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
482 (setq add-log-mailing-address |
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
483 (read-input "Mailing address: " add-log-mailing-address)))) |
31794
7e8ab579609b
(add-log-file-name): New function (split out of add-change-log-entry).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31720
diff
changeset
|
484 |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
485 (let* ((defun (add-log-current-defun)) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
486 (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
|
487 (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
|
488 (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
|
489 (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
|
490 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
|
491 (buffer-file (if buf-file-name (expand-file-name buf-file-name))) |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
492 (file-name (expand-file-name |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
493 (or file-name (find-change-log file-name buffer-file)))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
494 ;; 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
|
495 (item (add-log-file-name buffer-file file-name)) |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
496 bound) |
1727
d6cc12c97a59
(add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents:
1644
diff
changeset
|
497 |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
498 (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
|
499 (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
|
500 (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
|
501 (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
|
502 (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
|
503 (change-log-mode)) |
661 | 504 (undo-boundary) |
505 (goto-char (point-min)) | |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
506 |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
507 ;; 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
|
508 ;; 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
|
509 (when (looking-at "Copyright") |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
510 (search-forward "\n\n") |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
511 (skip-chars-forward "\n")) |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
512 |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
513 ;; 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
|
514 (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
|
515 (concat (funcall add-log-time-format) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
516 " " add-log-full-name |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
517 " <" addr ">")) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
518 (if (consp add-log-mailing-address) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
519 add-log-mailing-address |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
520 (list add-log-mailing-address))))) |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
521 (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
|
522 (let ((hit nil)) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
523 (dolist (entry new-entries hit) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
524 (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
|
525 (setq hit t))))) |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
526 (forward-line 1) |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
527 (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
|
528 new-entries) |
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
529 "\n\n") |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
530 (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
|
531 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
532 ;; 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
|
533 ;; 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
|
534 (setq bound |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
535 (save-excursion |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
536 (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
|
537 (skip-chars-forward "\n") |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
538 (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
|
539 (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
|
540 (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
|
541 (point))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
542 |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
543 ;; 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
|
544 (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
|
545 ;; 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
|
546 (if item |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
547 (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
|
548 ((and (not new-entry) |
12551
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
549 (let (case-fold-search) |
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
550 (re-search-forward |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
551 (concat (regexp-quote (concat "* " item)) |
12551
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
552 ;; Don't accept `foo.bar' when |
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
553 ;; looking for `foo': |
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
554 "\\(\\s \\|[(),:]\\)") |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
555 bound t))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
556 ;; 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
|
557 (re-search-forward "^\\s *$\\|^\\s \\*") |
12551
572a8ef6b1f4
(add-log-current-defun): Handle C struct definitions.
Karl Heuer <kwzh@gnu.org>
parents:
12157
diff
changeset
|
558 (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
|
559 ;; 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
|
560 (while (and (not (eobp)) (looking-at "^\\s *$")) |
28446 | 561 (delete-region (point) (line-beginning-position 2))) |
30809 | 562 (insert-char ?\n 2) |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
563 (forward-line -2) |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
564 (indent-relative-maybe)) |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
565 (t |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
566 ;; Make a new item. |
678 | 567 (while (looking-at "\\sW") |
568 (forward-line 1)) | |
912
1c37c99856de
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
569 (while (and (not (eobp)) (looking-at "^\\s *$")) |
28446 | 570 (delete-region (point) (line-beginning-position 2))) |
30809 | 571 (insert-char ?\n 3) |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
811
diff
changeset
|
572 (forward-line -2) |
678 | 573 (indent-to left-margin) |
30809 | 574 (insert "* ") |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
575 (if item (insert item)))) |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
811
diff
changeset
|
576 ;; 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
|
577 ;; Point is at the item for this file, |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
578 ;; 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
|
579 (if (not defun) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
580 ;; 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
|
581 (unless (save-excursion |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
582 (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
|
583 (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
|
584 (insert ": ") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
585 (if version (insert version ?\ ))) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
586 ;; 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
|
587 (undo-boundary) |
28446 | 588 (unless (save-excursion |
589 (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
|
590 (looking-at "\\s *$")) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
591 (insert ?\ )) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
592 ;; 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
|
593 ;; 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
|
594 (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
|
595 (skip-syntax-backward " ") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
596 (skip-chars-backward "):") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
597 (if (and (looking-at "):") |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
598 (let ((pos (save-excursion (backward-sexp 1) (point)))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
599 (when (equal (buffer-substring pos (point)) defun) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
600 (delete-region pos (point))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
601 (> fill-column (+ (current-column) (length defun) 4)))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
602 (progn (skip-chars-backward ", ") |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
603 (delete-region (point) pos) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
604 (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
|
605 (if (looking-at "):") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
606 (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
|
607 (goto-char pos) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
608 (insert "(")) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
609 (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
|
610 (insert defun "): ") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
611 (if version (insert version ?\ ))))) |
661 | 612 |
613 ;;;###autoload | |
614 (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
|
615 "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
|
616 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
|
617 the change log file in another window." |
661 | 618 (interactive (if current-prefix-arg |
619 (list current-prefix-arg | |
620 (prompt-for-change-log-name)))) | |
621 (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
|
622 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) |
661 | 623 |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
624 (defvar add-log-indent-text 0) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
625 |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
626 (defun add-log-indent () |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
627 (let* ((indent |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
628 (save-excursion |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
629 (beginning-of-line) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
630 (skip-chars-forward " \t") |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
631 (cond |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
632 ((and (looking-at "\\(.*\\) [^ \n].*[^ \n] <.*>$") |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
633 ;; Matching the output of add-log-time-format is difficult, |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
634 ;; but I'll get it has at least two adjacent digits. |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
635 (string-match "[[:digit:]][[:digit:]]" (match-string 1))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
636 0) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
637 ((looking-at "[^*(]") |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
638 (+ (current-left-margin) add-log-indent-text)) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
639 (t (current-left-margin))))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
640 (pos (save-excursion (indent-line-to indent) (point)))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
641 (if (> pos (point)) (goto-char pos)))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
642 |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
643 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
644 (defvar smerge-resolve-function) |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
645 |
980
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
646 ;;;###autoload |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
647 (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
|
648 "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
|
649 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
|
650 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window]. |
951 | 651 Each entry behaves as a paragraph, and the entries for one day as a page. |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
652 Runs `change-log-mode-hook'. |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
653 \\{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
|
654 (setq left-margin 8 |
13706
ba34746d66fd
(change-log-mode): Defaults for `indent-tabs-mode'
Karl Heuer <kwzh@gnu.org>
parents:
13648
diff
changeset
|
655 fill-column 74 |
15887
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
656 indent-tabs-mode t |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
657 tab-width 8) |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
658 (set (make-local-variable 'fill-paragraph-function) |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
659 'change-log-fill-paragraph) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
660 (set (make-local-variable 'indent-line-function) 'add-log-indent) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
661 (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
|
662 ;; 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
|
663 ;; 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
|
664 ;; 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
|
665 ;; between entries for different files. |
21749
84df514f7719
(change-log-mode): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
21719
diff
changeset
|
666 (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
|
667 (set (make-local-variable 'paragraph-separate) paragraph-start) |
1078
15b4ed20e524
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1062
diff
changeset
|
668 ;; 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
|
669 ;; 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
|
670 (set (make-local-variable 'page-delimiter) "^\\<\\|^\f") |
678 | 671 (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
|
672 (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
|
673 'change-log-resolve-conflict) |
678 | 674 (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
|
675 (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
|
676 '(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
|
677 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
678 ;; 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
|
679 ;; 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
|
680 ;; 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
|
681 ;; 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
|
682 (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
|
683 "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
|
684 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
|
685 (interactive "P") |
16505
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
686 (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
|
687 (beg (progn (backward-paragraph) (point))) |
13505
86470b361571
(change-log-mode): Remove incorrect "^" anchors from
Richard M. Stallman <rms@gnu.org>
parents:
13282
diff
changeset
|
688 (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
|
689 (fill-region beg end justify) |
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
690 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
|
691 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
692 (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
|
693 "^\\([[: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
|
694 "*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
|
695 :type 'regexp |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
696 :group 'change-log) |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
697 |
6562
0541a368505c
(add-log-current-defun): Autoload this.
Roland McGrath <roland@gnu.org>
parents:
6309
diff
changeset
|
698 ;;;###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
|
699 (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
|
700 '(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
|
701 "*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
|
702 |
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
|
703 ;;;###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
|
704 (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
|
705 '(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
|
706 "*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
|
707 |
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
|
708 ;;;###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
|
709 (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
|
710 '(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
|
711 "*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
|
712 |
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
|
713 ;;;###autoload |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
714 (defun add-log-current-defun () |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
715 "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
|
716 |
3499
6428162f137c
(add-log-current-defun): Fix typos in last change.
Richard M. Stallman <rms@gnu.org>
parents:
3486
diff
changeset
|
717 Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...), |
28446 | 718 Texinfo (@node titles) and Perl. |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
719 |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
720 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
|
721 point for uppercase headings starting in the first column or |
28446 | 722 identifiers followed by `:' or `='. See variables |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
723 `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
|
724 `add-log-current-defun-function'. |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
725 |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
726 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
|
727 (condition-case nil |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
728 (save-excursion |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
729 (let ((location (point))) |
28446 | 730 (cond (add-log-current-defun-function |
731 (funcall add-log-current-defun-function)) | |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
732 ((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
|
733 ;; 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
|
734 ;; 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
|
735 ;; rather than the previous one. |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
736 (or (eobp) (forward-char 1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
737 (beginning-of-defun) |
28446 | 738 ;; Make sure we are really inside the defun found, |
739 ;; not after it. | |
21944
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
740 (when (and (looking-at "\\s(") |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
741 (progn (end-of-defun) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
742 (< location (point))) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
743 (progn (forward-sexp -1) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
744 (>= location (point)))) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
745 (if (looking-at "\\s(") |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
746 (forward-char 1)) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
747 ;; Skip the defining construct name, typically "defun" |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
748 ;; or "defvar". |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
749 (forward-sexp 1) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
750 ;; 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
|
751 ;; If it is not, use the first symbol in it. |
22018 | 752 (skip-chars-forward " \t\n'(") |
28446 | 753 (buffer-substring-no-properties (point) |
754 (progn (forward-sexp 1) | |
755 (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
|
756 ((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
|
757 (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
|
758 (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
|
759 ;; 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
|
760 ;; 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
|
761 ;; 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
|
762 (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
|
763 (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
|
764 (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
|
765 ;; Handle a C macro definition. |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
766 (beginning-of-line) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
767 (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
|
768 (forward-line -1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
769 (search-forward "define") |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
770 (skip-chars-forward " \t") |
28446 | 771 (buffer-substring-no-properties (point) |
772 (progn (forward-sexp 1) | |
773 (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
|
774 ((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
|
775 (beginning-of-line) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
776 ;; 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
|
777 ;; 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
|
778 (while (not (looking-at "{\\|\\(\\s *$\\)")) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
779 (forward-line 1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
780 (or (eobp) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
781 (forward-char 1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
782 (beginning-of-defun) |
28446 | 783 (when (progn (end-of-defun) |
784 (< location (point))) | |
785 (backward-sexp 1) | |
786 (let (beg tem) | |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
787 |
28446 | 788 (forward-line -1) |
789 ;; Skip back over typedefs of arglist. | |
790 (while (and (not (bobp)) | |
791 (looking-at "[ \t\n]")) | |
792 (forward-line -1)) | |
793 ;; See if this is using the DEFUN macro used in Emacs, | |
794 ;; or the DEFUN macro used by the C library. | |
795 (if (condition-case nil | |
796 (and (save-excursion | |
797 (end-of-line) | |
798 (while (= (preceding-char) ?\\) | |
799 (end-of-line 2)) | |
800 (backward-sexp 1) | |
801 (beginning-of-line) | |
802 (setq tem (point)) | |
803 (looking-at "DEFUN\\b")) | |
804 (>= location tem)) | |
805 (error nil)) | |
806 (progn | |
807 (goto-char tem) | |
808 (down-list 1) | |
809 (if (= (char-after (point)) ?\") | |
810 (progn | |
811 (forward-sexp 1) | |
812 (skip-chars-forward " ,"))) | |
813 (buffer-substring-no-properties | |
814 (point) | |
815 (progn (forward-sexp 1) | |
816 (point)))) | |
817 (if (looking-at "^[+-]") | |
818 (change-log-get-method-definition) | |
819 ;; Ordinary C function syntax. | |
820 (setq beg (point)) | |
821 (if (and | |
822 ;; Protect against "Unbalanced parens" error. | |
823 (condition-case nil | |
824 (progn | |
825 (down-list 1) ; into arglist | |
826 (backward-up-list 1) | |
827 (skip-chars-backward " \t") | |
828 t) | |
829 (error nil)) | |
830 ;; Verify initial pos was after | |
831 ;; real start of function. | |
832 (save-excursion | |
833 (goto-char beg) | |
834 ;; For this purpose, include the line | |
835 ;; that has the decl keywords. This | |
836 ;; may also include some of the | |
837 ;; comments before the function. | |
838 (while (and (not (bobp)) | |
839 (save-excursion | |
840 (forward-line -1) | |
841 (looking-at "[^\n\f]"))) | |
842 (forward-line -1)) | |
843 (>= location (point))) | |
844 ;; Consistency check: going down and up | |
845 ;; shouldn't take us back before BEG. | |
846 (> (point) beg)) | |
847 (let (end middle) | |
848 ;; Don't include any final whitespace | |
849 ;; in the name we use. | |
850 (skip-chars-backward " \t\n") | |
851 (setq end (point)) | |
852 (backward-sexp 1) | |
853 ;; Now find the right beginning of the name. | |
854 ;; Include certain keywords if they | |
855 ;; precede the name. | |
856 (setq middle (point)) | |
857 (forward-word -1) | |
858 ;; Ignore these subparts of a class decl | |
859 ;; and move back to the class name itself. | |
860 (while (looking-at "public \\|private ") | |
861 (skip-chars-backward " \t:") | |
862 (setq end (point)) | |
863 (backward-sexp 1) | |
864 (setq middle (point)) | |
865 (forward-word -1)) | |
866 (and (bolp) | |
867 (looking-at | |
868 "enum \\|struct \\|union \\|class ") | |
869 (setq middle (point))) | |
870 (goto-char end) | |
871 (when (eq (preceding-char) ?=) | |
872 (forward-char -1) | |
873 (skip-chars-backward " \t") | |
874 (setq end (point))) | |
875 (buffer-substring-no-properties | |
876 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
|
877 ((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
|
878 (if (re-search-backward |
28446 | 879 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" |
880 nil t) | |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
881 (progn |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
882 (goto-char (match-beginning 0)) |
28446 | 883 (buffer-substring-no-properties |
884 (1+ (point)) ; without initial backslash | |
885 (line-end-position))))) | |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
886 ((eq major-mode 'texinfo-mode) |
9397
eba13d81ba0b
(add-log-current-defun): In texinfo-mode,
Richard M. Stallman <rms@gnu.org>
parents:
9377
diff
changeset
|
887 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t) |
28446 | 888 (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
|
889 ((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
|
890 (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t) |
28446 | 891 (match-string-no-properties 1))) |
892 ;; Emacs's autoconf-mode installs its own | |
893 ;; `add-log-current-defun-function'. This applies to | |
894 ;; a different mode apparently for editing .m4 | |
895 ;; autoconf source. | |
27945
c11a0bbb5c88
(add-log-current-defun): Add support for
Gerd Moellmann <gerd@gnu.org>
parents:
27310
diff
changeset
|
896 ((eq major-mode 'autoconf-mode) |
28446 | 897 (if (re-search-backward |
898 "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t) | |
899 (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
|
900 (t |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
901 ;; If all else fails, try heuristics |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
902 (let (case-fold-search |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
903 result) |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
904 (end-of-line) |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
905 (when (re-search-backward |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
906 add-log-current-defun-header-regexp |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
907 (- (point) 10000) |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
908 t) |
28446 | 909 (setq result (or (match-string-no-properties 1) |
910 (match-string-no-properties 0))) | |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
911 ;; Strip whitespace away |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
912 (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
|
913 result) |
28446 | 914 (setq result (match-string-no-properties 1 result))) |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
915 result)))))) |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
916 (error nil))) |
999 | 917 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
918 (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
|
919 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
920 ;; 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
|
921 ;; 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
|
922 ;; 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
|
923 (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
|
924 (setq change-log-get-method-definition-md |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
925 (concat change-log-get-method-definition-md |
28446 | 926 (match-string 1) |
13282
69fe836d7f02
(get-method-definition, get-method-definition-1):
Richard M. Stallman <rms@gnu.org>
parents:
13255
diff
changeset
|
927 end)) |
11749
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
928 (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
|
929 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
930 (defun change-log-get-method-definition () |
27240 | 931 "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
|
932 (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
|
933 (save-excursion |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
934 (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
|
935 (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
|
936 (save-excursion |
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
937 (cond |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
938 ((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
|
939 (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
|
940 (while (not (looking-at "[{;]")) |
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
941 (looking-at |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
942 "\\([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
|
943 (change-log-get-method-definition-1 "")) |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
944 (concat change-log-get-method-definition-md "]")))))) |
27240 | 945 |
946 (defun change-log-sortable-date-at () | |
947 "Return date of log entry in a consistent form for sorting. | |
948 Point is assumed to be at the start of the entry." | |
949 (require 'timezone) | |
950 (if (looking-at "^\\sw.........[0-9:+ ]*") | |
951 (let ((date (match-string-no-properties 0))) | |
952 (if date | |
953 (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date) | |
954 (concat (match-string 1 date) (match-string 2 date) | |
955 (match-string 3 date)) | |
956 (condition-case nil | |
957 (timezone-make-date-sortable date) | |
958 (error nil))))) | |
959 (error "Bad date"))) | |
11749
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
960 |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
961 (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
|
962 "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
|
963 (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
|
964 (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
|
965 (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
|
966 (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
|
967 (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
|
968 (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
|
969 (save-excursion |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
970 (save-restriction |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
971 (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
|
972 (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
|
973 (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
|
974 |
27240 | 975 ;;;###autoload |
976 (defun change-log-merge (other-log) | |
977 "Merge the contents of ChangeLog file OTHER-LOG with this buffer. | |
978 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
|
979 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
|
980 or a buffer. |
27240 | 981 |
30809 | 982 Entries are inserted in chronological order. Both the current and |
983 old-style time formats for entries are supported." | |
27240 | 984 (interactive "*fLog file name to merge: ") |
985 (if (not (eq major-mode 'change-log-mode)) | |
986 (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
|
987 (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
|
988 (find-file-noselect other-log))) |
27240 | 989 (buf (current-buffer)) |
990 date1 start end) | |
991 (save-excursion | |
992 (goto-char (point-min)) | |
993 (set-buffer other-buf) | |
994 (goto-char (point-min)) | |
995 (if (not (eq major-mode 'change-log-mode)) | |
996 (error "%s not found in Change Log mode" other-log)) | |
997 ;; Loop through all the entries in OTHER-LOG. | |
998 (while (not (eobp)) | |
999 (setq date1 (change-log-sortable-date-at)) | |
1000 (setq start (point) | |
1001 end (progn (forward-page) (point))) | |
1002 ;; Look for an entry in original buffer that isn't later. | |
1003 (with-current-buffer buf | |
1004 (while (and (not (eobp)) | |
1005 (string< date1 (change-log-sortable-date-at))) | |
1006 (forward-page)) | |
1007 (if (not (eobp)) | |
1008 (insert-buffer-substring other-buf start end) | |
1009 ;; At the end of the original buffer, insert a newline to | |
1010 ;; 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
|
1011 ;; merged. |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1012 (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
|
1013 (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
|
1014 (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
|
1015 (= ?\n (char-before (1- (point))))))) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1016 (insert "\n")) |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1017 ;; 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
|
1018 (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
|
1019 (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
|
1020 (insert-buffer-substring other-buf start))))))) |
999 | 1021 |
30809 | 1022 ;;;###autoload |
1023 (defun change-log-redate () | |
1024 "Fix any old-style date entries in the current log file to default format." | |
1025 (interactive) | |
1026 (require 'timezone) | |
1027 (save-excursion | |
1028 (goto-char (point-min)) | |
1029 (while (re-search-forward "^\\sw.........[0-9:+ ]*" nil t) | |
1030 (unless (= 12 (- (match-end 0) (match-beginning 0))) | |
1031 (let* ((date (save-match-data | |
1032 (timezone-fix-time (match-string 0) nil nil))) | |
1033 (zone (if (consp (aref date 6)) | |
1034 (nth 1 (aref date 6))))) | |
1035 (replace-match (format-time-string | |
1036 "%Y-%m-%d " | |
1037 (encode-time (aref date 5) | |
1038 (aref date 4) | |
1039 (aref date 3) | |
1040 (aref date 2) | |
1041 (aref date 1) | |
1042 (aref date 0) | |
1043 zone)))))))) | |
1044 | |
980
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
1045 (provide 'add-log) |
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
1046 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
678
diff
changeset
|
1047 ;;; add-log.el ends here |