Mercurial > emacs
annotate lisp/add-log.el @ 94902:bf4ea3254629
*** empty log message ***
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Tue, 13 May 2008 19:12:56 +0000 |
parents | ee5932bf781d |
children | c49219863e6b |
rev | line source |
---|---|
22388 | 1 ;;; add-log.el --- change log maintenance commands for Emacs |
661 | 2 |
74439 | 3 ;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001, |
79721 | 4 ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94225
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
661 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94225
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94225
diff
changeset
|
14 ;; (at your option) any later version. |
661 | 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 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94225
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
661 | 23 |
2307
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
24 ;;; Commentary: |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
25 |
10e417efb12a
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2247
diff
changeset
|
26 ;; 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
|
27 |
84370
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
28 ;; Todo: |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
29 |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
30 ;; - Find/use/create _MTN/log if there's a _MTN directory. |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
31 ;; - Find/use/create ++log.* if there's an {arch} directory. |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
32 ;; - Use an open *VC-Log* or *cvs-commit* buffer if it's related to the |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
33 ;; source file. |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
34 ;; - Don't add TAB indents (and username?) if inserting entries in those |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
35 ;; special places. |
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
36 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
678
diff
changeset
|
37 ;;; Code: |
661 | 38 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
39 (eval-when-compile |
94225
1e25298a53bc
(top-level): Require 'cl when compiling.
Glenn Morris <rgm@gnu.org>
parents:
93890
diff
changeset
|
40 (require 'cl) ; ignore-errors |
28446 | 41 (require 'timezone)) |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
42 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
43 (defgroup change-log nil |
63998
7651543ac34c
(change-log): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63668
diff
changeset
|
44 "Change log maintenance." |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
45 :group 'tools |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
46 :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
|
47 :prefix "change-log-" |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
48 :prefix "add-log-") |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
49 |
661 | 50 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
51 (defcustom change-log-default-name nil |
84370
08763df09731
"Todo" comment.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
52 "Name of a change log file for \\[add-change-log-entry]." |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
53 :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
|
54 string) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
55 :group 'change-log) |
70541
62bb603c277b
(change-log-default-name): Put `string-or-null-p'
Juri Linkov <juri@jurta.org>
parents:
70231
diff
changeset
|
56 (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
57 |
26613
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
58 (defcustom change-log-mode-hook nil |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
59 "Normal hook run by `change-log-mode'." |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
60 :type 'hook |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
61 :group 'change-log) |
7f7e6de546ac
(change-log-mode-hook): Customize.
Dave Love <fx@gnu.org>
parents:
25273
diff
changeset
|
62 |
50641
7ae78cd3ce2e
(add-log-current-defun-function): Add autoload cookie.
Richard M. Stallman <rms@gnu.org>
parents:
50575
diff
changeset
|
63 ;; 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
|
64 ;;;###autoload |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
65 (defcustom add-log-current-defun-function nil |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
66 "If non-nil, function to guess name of surrounding function. |
28446 | 67 It is used by `add-log-current-defun' in preference to built-in rules. |
68 Returns function's name as a string, or nil if outside a function." | |
35936 | 69 :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
|
70 :group 'change-log) |
4154
20a0593431b7
(add-log-current-defun-function): New defvar.
Roland McGrath <roland@gnu.org>
parents:
3897
diff
changeset
|
71 |
14856
f64fa743c80f
(add-log-full-name, add-log-mailing-address): Add autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
14528
diff
changeset
|
72 ;;;###autoload |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
73 (defcustom add-log-full-name nil |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
74 "Full name of user, for inclusion in ChangeLog daily headers. |
27240 | 75 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
|
76 :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
|
77 string) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
78 :group 'change-log) |
4741
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
79 |
14856
f64fa743c80f
(add-log-full-name, add-log-mailing-address): Add autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents:
14528
diff
changeset
|
80 ;;;###autoload |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
81 (defcustom add-log-mailing-address nil |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
82 "Email addresses of user, for inclusion in ChangeLog headers. |
45267
c9022ab03c89
(add-log-mailing-address): Can be a list, too.
Colin Walters <walters@gnu.org>
parents:
45255
diff
changeset
|
83 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
|
84 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
|
85 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
|
86 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
|
87 :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
|
88 (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
|
89 (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
|
90 :group 'change-log) |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
91 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
92 (defcustom add-log-time-format 'add-log-iso8601-time-string |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
93 "Function that defines the time format. |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
94 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
|
95 date in international ISO 8601 format, |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
96 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
|
97 :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
|
98 add-log-iso8601-time-string) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
99 (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
|
100 current-time-string) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
101 (function :tag "Other")) |
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
102 :group 'change-log) |
4741
c0ea0009268a
add-log-full-name, add-log-mailing-address: new varialbes
Brian Fox <bfox@gnu.org>
parents:
4380
diff
changeset
|
103 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
104 (defcustom add-log-keep-changes-together nil |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
105 "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
|
106 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
107 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
|
108 \\[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
|
109 for that file made |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
110 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
|
111 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
|
112 original log: |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
113 |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
114 * foo (...): ... |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
115 * bar (...): change 1 |
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 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
|
118 buffer visiting `bar', yields: |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
119 |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
120 * bar (...): -!- |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
121 * foo (...): ... |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
122 * bar (...): change 1 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
123 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
124 and in the former: |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
125 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
126 * foo (...): ... |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
127 * bar (...): change 1 |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
128 (...): -!- |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
129 |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
130 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
|
131 this variable." |
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
132 :version "20.3" |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
133 :type 'boolean |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
134 :group 'change-log) |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
135 |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
136 (defcustom add-log-always-start-new-record nil |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
137 "If non-nil, `add-change-log-entry' will always start a new record." |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59355
diff
changeset
|
138 :version "22.1" |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
139 :type 'boolean |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
140 :group 'change-log) |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
141 |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
142 (defcustom add-log-buffer-file-name-function nil |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
143 "If non-nil, function to call to identify the full filename of a buffer. |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
144 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
|
145 use `buffer-file-name'." |
35936 | 146 :type '(choice (const nil) function) |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
147 :group 'change-log) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
148 |
24289
7917ac967ee5
(add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
23215
diff
changeset
|
149 (defcustom add-log-file-name-function nil |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
150 "If non-nil, function to call to identify the filename for a ChangeLog entry. |
27240 | 151 This function is called with one argument, the value of variable |
152 `buffer-file-name' in that buffer. If this is nil, the default is to | |
153 use the file's name relative to the directory of the change log file." | |
35936 | 154 :type '(choice (const nil) function) |
24289
7917ac967ee5
(add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
23215
diff
changeset
|
155 :group 'change-log) |
7917ac967ee5
(add-log-file-name-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
23215
diff
changeset
|
156 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
157 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
158 (defcustom change-log-version-info-enabled nil |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
159 "If non-nil, enable recording version numbers with the changes." |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
160 :version "21.1" |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
161 :type 'boolean |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
162 :group 'change-log) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
163 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
164 (defcustom change-log-version-number-regexp-list |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
165 (let ((re "\\([0-9]+\.[0-9.]+\\)")) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
166 (list |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
167 ;; (defconst ad-version "2.15" |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
168 (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
|
169 ;; Revision: pcl-cvs.el,v 1.72 1999/09/05 20:21:54 monnier Exp |
28446 | 170 (concat "^;+ *Revision: +[^ \t\n]+[ \t]+" re))) |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
171 "List of regexps to search for version number. |
28446 | 172 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
|
173 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
|
174 :version "21.1" |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
175 :type '(repeat regexp) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
176 :group 'change-log) |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
177 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
178 (defface change-log-date |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
179 '((t (:inherit font-lock-string-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
180 "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
|
181 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
182 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
183 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
184 (put 'change-log-date-face 'face-alias 'change-log-date) |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
185 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
186 (defface change-log-name |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
187 '((t (:inherit font-lock-constant-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
188 "Face for highlighting author names." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
189 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
190 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
191 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
192 (put 'change-log-name-face 'face-alias 'change-log-name) |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
193 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
194 (defface change-log-email |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
195 '((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
|
196 "Face for highlighting author email addresses." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
197 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
198 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
199 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
200 (put 'change-log-email-face 'face-alias 'change-log-email) |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
201 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
202 (defface change-log-file |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
203 '((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
|
204 "Face for highlighting file names." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
205 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
206 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
207 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
208 (put 'change-log-file-face 'face-alias 'change-log-file) |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
209 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
210 (defface change-log-list |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
211 '((t (:inherit font-lock-keyword-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
212 "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
|
213 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
214 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
215 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
216 (put 'change-log-list-face 'face-alias 'change-log-list) |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
217 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
218 (defface change-log-conditionals |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
219 '((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
|
220 "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
|
221 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
222 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
223 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
224 (put 'change-log-conditionals-face 'face-alias 'change-log-conditionals) |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
225 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
226 (defface change-log-function |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
227 '((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
|
228 "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
|
229 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
230 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
231 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
232 (put 'change-log-function-face 'face-alias 'change-log-function) |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
233 |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
234 (defface change-log-acknowledgement |
31813
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
235 '((t (:inherit font-lock-comment-face))) |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
236 "Face for highlighting acknowledgments." |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
237 :version "21.1" |
b7491dcc3530
(change-log-date-face, change-log-name-face)
Gerd Moellmann <gerd@gnu.org>
parents:
31794
diff
changeset
|
238 :group 'change-log) |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
239 ;; backward-compatibility alias |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
240 (put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement) |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
241 |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
242 (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)") |
88036
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
243 (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*") |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
244 |
9377
45228a0f6b78
(change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents:
9347
diff
changeset
|
245 (defvar change-log-font-lock-keywords |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
246 `(;; |
63668
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
247 ;; Date lines, new (2000-01-01) and old (Sat Jan 1 00:00:00 2000) styles. |
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
248 ;; Fixme: this regepx is just an approximate one and may match |
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
249 ;; wrongly with a non-date line existing as a random note. In |
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
250 ;; addition, using any kind of fixed setting like this doesn't |
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
251 ;; work if a user customizes add-log-time-format. |
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
252 ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" |
a7098c7b8f0f
(change-log-font-lock-keywords): Make the regexp for
Kenichi Handa <handa@m17n.org>
parents:
63195
diff
changeset
|
253 (0 'change-log-date-face) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
254 ;; Name and e-mail; some people put e-mail in parens, not angles. |
62877
b03135d4ca2a
(change-log-font-lock-keywords):
Juri Linkov <juri@jurta.org>
parents:
62458
diff
changeset
|
255 ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
256 (1 'change-log-name) |
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
257 (2 'change-log-email))) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
258 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
259 ;; File names. |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
260 (,change-log-file-names-re |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
261 (2 'change-log-file) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
262 ;; Possibly further names in a list: |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
263 ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file)) |
23215
c06f07cf6bba
(change-log-font-lock-keywords): Do parenthesized
Dave Love <fx@gnu.org>
parents:
22388
diff
changeset
|
264 ;; Possibly a parenthesized list of names: |
61265
847e4dd1b608
(change-log-font-lock-keywords): Names in parenthesized lists can
Lute Kamstra <lute@gnu.org>
parents:
61253
diff
changeset
|
265 ("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
266 nil nil (1 'change-log-list)) |
61265
847e4dd1b608
(change-log-font-lock-keywords): Names in parenthesized lists can
Lute Kamstra <lute@gnu.org>
parents:
61253
diff
changeset
|
267 ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
268 nil nil (1 'change-log-list))) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
269 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
270 ;; Function or variable names. |
61342
2a3ffd4954e2
(change-log-font-lock-keywords): Complete 2005-04-03 change.
Lute Kamstra <lute@gnu.org>
parents:
61265
diff
changeset
|
271 ("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
272 (2 'change-log-list) |
61265
847e4dd1b608
(change-log-font-lock-keywords): Names in parenthesized lists can
Lute Kamstra <lute@gnu.org>
parents:
61253
diff
changeset
|
273 ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
274 (1 'change-log-list))) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
275 ;; |
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
276 ;; Conditionals. |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
277 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals)) |
16450
82b0566ece27
Tweak change-log-font-lock-keywords
Simon Marshall <simon@gnu.org>
parents:
16035
diff
changeset
|
278 ;; |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
279 ;; Function of change. |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
280 ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function)) |
29329
5b85d9e700da
(change-log-font-lock-keywords) <function>: Add
Dave Love <fx@gnu.org>
parents:
29243
diff
changeset
|
281 ;; |
19439 | 282 ;; Acknowledgements. |
59355
448dec90812c
(change-log-font-lock-keywords): Don't match just "From".
Richard M. Stallman <rms@gnu.org>
parents:
58737
diff
changeset
|
283 ;; Don't include plain "From" because that is vague; |
448dec90812c
(change-log-font-lock-keywords): Don't match just "From".
Richard M. Stallman <rms@gnu.org>
parents:
58737
diff
changeset
|
284 ;; we want to encourage people to say something more specific. |
62255 | 285 ;; Note that the FSF does not use "Patches by"; our convention |
286 ;; is to put the name of the author of the changes at the top | |
287 ;; of the change log entry. | |
61342
2a3ffd4954e2
(change-log-font-lock-keywords): Complete 2005-04-03 change.
Lute Kamstra <lute@gnu.org>
parents:
61265
diff
changeset
|
288 ("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" |
63195
d4857c25a45b
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-366
Miles Bader <miles@gnu.org>
parents:
62877
diff
changeset
|
289 3 'change-log-acknowledgement)) |
9377
45228a0f6b78
(change-log-mode): Set font-lock-keywords locally.
Richard M. Stallman <rms@gnu.org>
parents:
9347
diff
changeset
|
290 "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
|
291 |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
292 (defun change-log-search-file-name (where) |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
293 "Return the file-name for the change under point." |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
294 (save-excursion |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
295 (goto-char where) |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
296 (beginning-of-line 1) |
88036
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
297 (if (looking-at change-log-start-entry-re) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
298 ;; We are at the start of an entry, search forward for a file |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
299 ;; name. |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
300 (progn |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
301 (re-search-forward change-log-file-names-re nil t) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
302 (match-string 2)) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
303 (if (looking-at change-log-file-names-re) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
304 ;; We found a file name. |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
305 (match-string 2) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
306 ;; Look backwards for either a file name or the log entry start. |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
307 (if (re-search-backward |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
308 (concat "\\(" change-log-start-entry-re |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
309 "\\)\\|\\(" |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
310 change-log-file-names-re "\\)") nil t) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
311 (if (match-beginning 1) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
312 ;; We got the start of the entry, look forward for a |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
313 ;; file name. |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
314 (progn |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
315 (re-search-forward change-log-file-names-re nil t) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
316 (match-string 2)) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
317 (match-string 4)) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
318 ;; We must be before any file name, look forward. |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
319 (re-search-forward change-log-file-names-re nil t) |
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
320 (match-string 2)))))) |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
321 |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
322 (defun change-log-find-file () |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
323 "Visit the file for the change under point." |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
324 (interactive) |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
325 (let ((file (change-log-search-file-name (point)))) |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
326 (if (and file (file-exists-p file)) |
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
327 (find-file file) |
88036
f58e88e8d9cb
(change-log-search-file-name): Work harder to find
Dan Nicolaescu <dann@ics.uci.edu>
parents:
88035
diff
changeset
|
328 (message "No such file or directory: %s" file)))) |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
329 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
330 (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
|
331 (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
|
332 (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
|
333 (define-key map [?\C-c ?\C-n] 'add-log-edit-next-comment) |
88035
edcfc11338ad
* add-log.el (change-log-search-file-name, change-log-find-file):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87649
diff
changeset
|
334 (define-key map [?\C-c ?\C-f] 'change-log-find-file) |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
335 map) |
15889 | 336 "Keymap for Change Log major mode.") |
337 | |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
338 ;; It used to be called change-log-time-zone-rule but really should be |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
339 ;; called add-log-time-zone-rule since it's only used from add-log-* code. |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
340 (defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule) |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
341 (defvar add-log-time-zone-rule nil |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
342 "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
|
343 It takes the same format as the TZ argument of `set-time-zone-rule'. |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
344 If nil, use local time. |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
345 If t, use universal time.") |
73719
f172c9540c9c
(add-log-time-zone-rule): Mark as safe-local-variable.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
73052
diff
changeset
|
346 (put 'add-log-time-zone-rule 'safe-local-variable |
f172c9540c9c
(add-log-time-zone-rule): Mark as safe-local-variable.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
73052
diff
changeset
|
347 '(lambda (x) (or (booleanp x) (stringp x)))) |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
348 |
70231
b98a2445fe1f
(add-log-iso8601-time-zone): Make parameter optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70217
diff
changeset
|
349 (defun add-log-iso8601-time-zone (&optional time) |
15909
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
350 (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
|
351 (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
|
352 (sec (abs utc-offset)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
353 (ss (% sec 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
354 (min (/ sec 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
355 (mm (% min 60)) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
356 (hh (/ min 60))) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
357 (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
|
358 ((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
|
359 (t "%c%02d")) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
360 sign hh mm ss))) |
088510eef043
Change to ISO 8601 date formats, without time of day.
Erik Naggum <erik@naggum.no>
parents:
15889
diff
changeset
|
361 |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
362 (defvar add-log-iso8601-with-time-zone nil) |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
363 |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
364 (defun add-log-iso8601-time-string () |
70231
b98a2445fe1f
(add-log-iso8601-time-zone): Make parameter optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70217
diff
changeset
|
365 (let ((time (format-time-string "%Y-%m-%d" |
b98a2445fe1f
(add-log-iso8601-time-zone): Make parameter optional.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
70217
diff
changeset
|
366 nil (eq t add-log-time-zone-rule)))) |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
367 (if add-log-iso8601-with-time-zone |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
368 (concat time " " (add-log-iso8601-time-zone)) |
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
369 time))) |
18277
7509948b0121
(add-log-time-format): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17923
diff
changeset
|
370 |
661 | 371 (defun change-log-name () |
27240 | 372 "Return (system-dependent) default name for a change log file." |
661 | 373 (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
|
374 (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
|
375 "$CHANGE_LOG$.TXT" |
9d8b374b5bb1
(change-log-name): Don't treat MSDOS, NT specially.
Richard M. Stallman <rms@gnu.org>
parents:
15909
diff
changeset
|
376 "ChangeLog"))) |
661 | 377 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
378 (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
|
379 "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
|
380 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
|
381 (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
|
382 (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
|
383 (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
|
384 (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
|
385 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
|
386 (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
|
387 (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
|
388 (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
|
389 (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
|
390 (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
|
391 (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
|
392 (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
|
393 (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
|
394 (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
|
395 (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
|
396 |
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
397 (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
|
398 "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
|
399 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
|
400 (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
|
401 (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
|
402 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
403 ;;;###autoload |
661 | 404 (defun prompt-for-change-log-name () |
405 "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
|
406 (let* ((default (change-log-name)) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
407 (name (expand-file-name |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
408 (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
|
409 nil default)))) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
410 ;; 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
|
411 ;; 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
|
412 (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
|
413 (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
|
414 name) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
415 ;; 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
|
416 (if (file-directory-p name) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
417 (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
|
418 (file-name-as-directory name)) |
f4a8265756e7
(prompt-for-change-log-name): Handle the case where
Karl Heuer <kwzh@gnu.org>
parents:
11816
diff
changeset
|
419 name)))) |
661 | 420 |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
421 (defun change-log-version-number-search () |
28446 | 422 "Return version number of current buffer's file. |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84676
diff
changeset
|
423 This is the value returned by `vc-working-revision' or, if that is |
28446 | 424 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
|
425 (let* ((size (buffer-size)) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
426 (limit |
28446 | 427 ;; The version number can be anywhere in the file, but |
428 ;; restrict search to the file beginning: 10% should be | |
429 ;; enough to prevent some mishits. | |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
430 ;; |
28446 | 431 ;; Apply percentage only if buffer size is bigger than |
432 ;; approx 100 lines. | |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
433 (if (> size (* 100 80)) (+ (point) (/ size 10))))) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84676
diff
changeset
|
434 (or (and buffer-file-name (vc-working-revision buffer-file-name)) |
28446 | 435 (save-restriction |
436 (widen) | |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
437 (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
|
438 version) |
28446 | 439 (while regexps |
440 (save-excursion | |
441 (goto-char (point-min)) | |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
442 (when (re-search-forward (pop regexps) limit t) |
28446 | 443 (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
|
444 regexps nil)))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
445 version))))) |
27003
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
446 |
f6f431fc901b
(change-log-version-number-regexp-list)
Gerd Moellmann <gerd@gnu.org>
parents:
26618
diff
changeset
|
447 |
661 | 448 ;;;###autoload |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
449 (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
|
450 "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
|
451 |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
452 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
|
453 If FILE-NAME is nil, use the value of `change-log-default-name'. |
62251
5c40be16225d
(find-change-log): Fix typos in the docstring of function.
Masatake YAMATO <jet@gyve.org>
parents:
61342
diff
changeset
|
454 If `change-log-default-name' is nil, behave as though it were 'ChangeLog' |
9886
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
455 \(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
|
456 |
62251
5c40be16225d
(find-change-log): Fix typos in the docstring of function.
Masatake YAMATO <jet@gyve.org>
parents:
61342
diff
changeset
|
457 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
|
458 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
|
459 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
|
460 |
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
461 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
|
462 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
|
463 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
|
464 ;; 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
|
465 ;; just use that. |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
466 (or file-name |
9886
f54af6fe889e
(find-change-log): If change-log-default-name
Richard M. Stallman <rms@gnu.org>
parents:
9774
diff
changeset
|
467 (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
|
468 (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
|
469 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
|
470 (progn |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
471 ;; 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
|
472 ;; 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
|
473 (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
|
474 (file-name-directory |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
475 (file-chase-links |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
476 (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
|
477 default-directory)) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
478 (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
|
479 (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
|
480 ;; 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
|
481 ;; 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
|
482 ;; 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
|
483 (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
|
484 (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
|
485 ;; 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
|
486 (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
|
487 parent-dir) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
488 (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
|
489 (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
|
490 (file-name-directory |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
491 (directory-file-name |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
492 (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
|
493 ;; 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
|
494 (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
|
495 parent-dir)))) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
496 ;; 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
|
497 (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
|
498 (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
|
499 parent-dir))) |
0495d3085f00
(find-change-log): If file name specified, just use it.
Richard M. Stallman <rms@gnu.org>
parents:
6562
diff
changeset
|
500 ;; 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
|
501 (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
|
502 (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
|
503 ;; 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
|
504 (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
|
505 file-name) |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
506 |
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
|
507 (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
|
508 ;; 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
|
509 (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
|
510 (if add-log-file-name-function |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
511 (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
|
512 (setq buffer-file |
82002
43f5e1e99ca4
(add-log-file-name): Use file-relative-name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81943
diff
changeset
|
513 (file-relative-name buffer-file (file-name-directory log-file))) |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
514 ;; 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
|
515 ;; 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
|
516 ;; 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
|
517 (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
|
518 (file-name-sans-versions buffer-file) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
519 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
|
520 |
2463
d3c9f0ad5964
(find-change-log): New function.
Roland McGrath <roland@gnu.org>
parents:
2307
diff
changeset
|
521 ;;;###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
|
522 (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
|
523 "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
|
524 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user |
54983
e6f8f4939bf6
(add-change-log-entry): Update doc string to mention
Stephen Eglen <stephen@gnu.org>
parents:
54430
diff
changeset
|
525 name and email (stored in `add-log-full-name' and `add-log-mailing-address'). |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
526 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
527 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
|
528 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
|
529 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
530 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
|
531 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
532 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
|
533 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
|
534 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
|
535 |
40315
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
536 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
|
537 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
|
538 the same person. |
e41eca24ba8c
(add-log-always-start-new-record): New user option.
Sam Steingold <sds@gnu.org>
parents:
39625
diff
changeset
|
539 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
540 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
|
541 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
|
542 notices. |
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
543 |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
544 Today's date is calculated according to `add-log-time-zone-rule' if |
21629
2da609ac7ab1
(change-log-mode): Revert 1997-12-03 doc change.
Dave Love <fx@gnu.org>
parents:
21009
diff
changeset
|
545 non-nil, otherwise in local time." |
661 | 546 (interactive (list current-prefix-arg |
547 (prompt-for-change-log-name))) | |
32011
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
548 (let* ((defun (add-log-current-defun)) |
534b5a76bf8a
(find-change-log): New arg BUFFER-FILE.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31813
diff
changeset
|
549 (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
|
550 (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
|
551 (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
|
552 (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
|
553 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
|
554 (buffer-file (if buf-file-name (expand-file-name buf-file-name))) |
54430
b521d24f538a
(add-change-log-entry): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
555 (file-name (expand-file-name (find-change-log file-name buffer-file))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
556 ;; Set ITEM to the file name to use in the new item. |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
557 (item (add-log-file-name buffer-file file-name))) |
1727
d6cc12c97a59
(add-change-log-entry): Notice when ENTRY is equal to FILE-NAME,
Roland McGrath <roland@gnu.org>
parents:
1644
diff
changeset
|
558 |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
559 (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
|
560 (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
|
561 (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
|
562 (find-file file-name))) |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
563 (or (derived-mode-p 'change-log-mode) |
5150
60fa14264c3b
(add-change-log-entry): put buffer in change-log-mode.
Richard M. Stallman <rms@gnu.org>
parents:
5038
diff
changeset
|
564 (change-log-mode)) |
661 | 565 (undo-boundary) |
566 (goto-char (point-min)) | |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
567 |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
568 (let ((full-name (or add-log-full-name (user-full-name))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
569 (mailing-address (or add-log-mailing-address user-mail-address))) |
78134
af3890de344f
(add-change-log-entry): Check add-log-full-name
Richard M. Stallman <rms@gnu.org>
parents:
75446
diff
changeset
|
570 |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
571 (when whoami |
82073 | 572 (setq full-name (read-string "Full name: " full-name)) |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
573 ;; Note that some sites have room and phone number fields in |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
574 ;; full name which look silly when inserted. Rather than do |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
575 ;; anything about that here, let user give prefix argument so that |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
576 ;; s/he can edit the full name field in prompter if s/he wants. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
577 (setq mailing-address |
82073 | 578 (read-string "Mailing address: " mailing-address))) |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
579 |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
580 ;; If file starts with a copyright and permission notice, skip them. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
581 ;; Assume they end at first blank line. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
582 (when (looking-at "Copyright") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
583 (search-forward "\n\n") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
584 (skip-chars-forward "\n")) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
585 |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
586 ;; Advance into first entry if it is usable; else make new one. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
587 (let ((new-entries |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
588 (mapcar (lambda (addr) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
589 (concat |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
590 (if (stringp add-log-time-zone-rule) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
591 (let ((tz (getenv "TZ"))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
592 (unwind-protect |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
593 (progn |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
594 (set-time-zone-rule add-log-time-zone-rule) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
595 (funcall add-log-time-format)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
596 (set-time-zone-rule tz))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
597 (funcall add-log-time-format)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
598 " " full-name |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
599 " <" addr ">")) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
600 (if (consp mailing-address) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
601 mailing-address |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
602 (list mailing-address))))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
603 (if (and (not add-log-always-start-new-record) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
604 (let ((hit nil)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
605 (dolist (entry new-entries hit) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
606 (when (looking-at (regexp-quote entry)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
607 (setq hit t))))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
608 (forward-line 1) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
609 (insert (nth (random (length new-entries)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
610 new-entries) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
611 (if use-hard-newlines hard-newline "\n") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
612 (if use-hard-newlines hard-newline "\n")) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
613 (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
|
614 |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
615 ;; 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
|
616 ;; item to add to, within this entry. |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
617 (let ((bound |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
618 (save-excursion |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
619 (if (looking-at "\n*[^\n* \t]") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
620 (skip-chars-forward "\n") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
621 (if add-log-keep-changes-together |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
622 (forward-page) ; page delimits entries for date |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
623 (forward-paragraph))) ; paragraph delimits entries for file |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
624 (point)))) |
39625
e441240482b2
(add-change-log-entry): Skip copyright notice
Richard M. Stallman <rms@gnu.org>
parents:
38697
diff
changeset
|
625 |
82003
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
626 ;; Now insert the new line for this item. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
627 (cond ((re-search-forward "^\\s *\\*\\s *$" bound t) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
628 ;; Put this file name into the existing empty item. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
629 (if item |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
630 (insert item))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
631 ((and (not new-entry) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
632 (let (case-fold-search) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
633 (re-search-forward |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
634 (concat (regexp-quote (concat "* " item)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
635 ;; Don't accept `foo.bar' when |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
636 ;; looking for `foo': |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
637 "\\(\\s \\|[(),:]\\)") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
638 bound t))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
639 ;; Add to the existing item for the same file. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
640 (re-search-forward "^\\s *$\\|^\\s \\*") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
641 (goto-char (match-beginning 0)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
642 ;; Delete excess empty lines; make just 2. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
643 (while (and (not (eobp)) (looking-at "^\\s *$")) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
644 (delete-region (point) (line-beginning-position 2))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
645 (insert (if use-hard-newlines hard-newline "\n") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
646 (if use-hard-newlines hard-newline "\n")) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
647 (forward-line -2) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
648 (indent-relative-maybe)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
649 (t |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
650 ;; Make a new item. |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
651 (while (looking-at "\\sW") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
652 (forward-line 1)) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
653 (while (and (not (eobp)) (looking-at "^\\s *$")) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
654 (delete-region (point) (line-beginning-position 2))) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
655 (insert (if use-hard-newlines hard-newline "\n") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
656 (if use-hard-newlines hard-newline "\n") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
657 (if use-hard-newlines hard-newline "\n")) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
658 (forward-line -2) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
659 (indent-to left-margin) |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
660 (insert "* ") |
571d99dbf19d
(add-change-log-entry): Delay reading add-log-(full-name|mailing-address)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82002
diff
changeset
|
661 (if item (insert item))))) |
837
a8aef92e0025
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
811
diff
changeset
|
662 ;; 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
|
663 ;; Point is at the item for this file, |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
664 ;; 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
|
665 (if (not defun) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
666 ;; 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
|
667 (unless (save-excursion |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
668 (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
|
669 (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
|
670 (insert ": ") |
63998
7651543ac34c
(change-log): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63668
diff
changeset
|
671 (if version (insert version ?\s))) |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
672 ;; 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
|
673 (undo-boundary) |
28446 | 674 (unless (save-excursion |
675 (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
|
676 (looking-at "\\s *$")) |
63998
7651543ac34c
(change-log): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63668
diff
changeset
|
677 (insert ?\s)) |
49308
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
678 ;; 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
|
679 ;; 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
|
680 (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
|
681 (skip-syntax-backward " ") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
682 (skip-chars-backward "):") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
683 (if (and (looking-at "):") |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
684 (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
|
685 (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
|
686 (delete-region pos (point))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
687 (> 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
|
688 (progn (skip-chars-backward ", ") |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
689 (delete-region (point) pos) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
690 (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
|
691 (if (looking-at "):") |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
692 (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
|
693 (goto-char pos) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
694 (insert "(")) |
0e6cefe9e2d0
(add-change-log-entry): Don't leave space at eol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
48615
diff
changeset
|
695 (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
|
696 (insert defun "): ") |
63998
7651543ac34c
(change-log): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents:
63668
diff
changeset
|
697 (if version (insert version ?\s))))) |
661 | 698 |
699 ;;;###autoload | |
700 (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
|
701 "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
|
702 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
|
703 the change log file in another window." |
661 | 704 (interactive (if current-prefix-arg |
705 (list current-prefix-arg | |
706 (prompt-for-change-log-name)))) | |
707 (add-change-log-entry whoami file-name t)) | |
708 | |
82017
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
709 |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
710 (defvar change-log-indent-text 0) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
711 |
82017
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
712 (defun change-log-fill-parenthesized-list () |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
713 ;; Fill parenthesized lists of names according to GNU standards. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
714 ;; * file-name.ext (very-long-foo, very-long-bar, very-long-foobar): |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
715 ;; should be filled as |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
716 ;; * file-name.ext (very-long-foo, very-long-bar) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
717 ;; (very-long-foobar): |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
718 (save-excursion |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
719 (end-of-line 0) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
720 (skip-chars-backward " \t") |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
721 (when (and (equal (char-before) ?\,) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
722 (> (point) (1+ (point-min)))) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
723 (condition-case nil |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
724 (when (save-excursion |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
725 (and (prog2 |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
726 (up-list -1) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
727 (equal (char-after) ?\() |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
728 (skip-chars-backward " \t")) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
729 (or (bolp) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
730 ;; Skip everything but a whitespace or asterisk. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
731 (and (not (zerop (skip-chars-backward "^ \t\n*"))) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
732 (skip-chars-backward " \t") |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
733 ;; We want one asterisk here. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
734 (= (skip-chars-backward "*") -1) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
735 (skip-chars-backward " \t") |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
736 (bolp))))) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
737 ;; Delete the comma. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
738 (delete-char -1) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
739 ;; Close list on previous line. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
740 (insert ")") |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
741 (skip-chars-forward " \t\n") |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
742 ;; Start list on new line. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
743 (insert-before-markers "(")) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
744 (error nil))))) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
745 |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
746 (defun change-log-indent () |
82017
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
747 (change-log-fill-parenthesized-list) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
748 (let* ((indent |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
749 (save-excursion |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
750 (beginning-of-line) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
751 (skip-chars-forward " \t") |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
752 (cond |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
753 ((and (looking-at "\\(.*\\) [^ \n].*[^ \n] <.*>\\(?: +(.*)\\)? *$") |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
754 ;; 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
|
755 ;; 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
|
756 (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
|
757 0) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
758 ((looking-at "[^*(]") |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
759 (+ (current-left-margin) change-log-indent-text)) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
760 (t (current-left-margin))))) |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
761 (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
|
762 (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
|
763 |
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
764 |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
765 (defvar smerge-resolve-function) |
94225
1e25298a53bc
(top-level): Require 'cl when compiling.
Glenn Morris <rgm@gnu.org>
parents:
93890
diff
changeset
|
766 (defvar copyright-at-end-flag) |
51580
d9592ff1371e
(add-log-edit-prev-comment, add-log-edit-next-comment): New commands.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50641
diff
changeset
|
767 |
980
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
768 ;;;###autoload |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
769 (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
|
770 "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
|
771 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
|
772 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window]. |
951 | 773 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
|
774 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
|
775 \\{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
|
776 (setq left-margin 8 |
13706
ba34746d66fd
(change-log-mode): Defaults for `indent-tabs-mode'
Karl Heuer <kwzh@gnu.org>
parents:
13648
diff
changeset
|
777 fill-column 74 |
15887
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
778 indent-tabs-mode t |
81501
801606fb518b
(change-log-mode): Set `show-trailing-whitespace'.
Juanma Barranquero <lekktu@gmail.com>
parents:
75446
diff
changeset
|
779 tab-width 8 |
801606fb518b
(change-log-mode): Set `show-trailing-whitespace'.
Juanma Barranquero <lekktu@gmail.com>
parents:
75446
diff
changeset
|
780 show-trailing-whitespace t) |
15887
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
781 (set (make-local-variable 'fill-paragraph-function) |
18c1dcf40139
(change-log-mode): Set fill-paragraph-function.
Karl Heuer <kwzh@gnu.org>
parents:
15299
diff
changeset
|
782 'change-log-fill-paragraph) |
81943
d32ff111504c
(change-log-mode): Use fill-nobreak-predicate to
Martin Rudalics <rudalics@gmx.at>
parents:
81501
diff
changeset
|
783 ;; Avoid that filling leaves behind a single "*" on a line. |
d32ff111504c
(change-log-mode): Use fill-nobreak-predicate to
Martin Rudalics <rudalics@gmx.at>
parents:
81501
diff
changeset
|
784 (add-hook 'fill-nobreak-predicate |
d32ff111504c
(change-log-mode): Use fill-nobreak-predicate to
Martin Rudalics <rudalics@gmx.at>
parents:
81501
diff
changeset
|
785 '(lambda () |
94225
1e25298a53bc
(top-level): Require 'cl when compiling.
Glenn Morris <rgm@gnu.org>
parents:
93890
diff
changeset
|
786 (looking-back "^\\s *\\*\\s *" (line-beginning-position))) |
81943
d32ff111504c
(change-log-mode): Use fill-nobreak-predicate to
Martin Rudalics <rudalics@gmx.at>
parents:
81501
diff
changeset
|
787 nil t) |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
788 (set (make-local-variable 'indent-line-function) 'change-log-indent) |
50575
caadcafadb0c
(change-log-version-number-search): Fix old bug.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49308
diff
changeset
|
789 (set (make-local-variable 'tab-always-indent) nil) |
94225
1e25298a53bc
(top-level): Require 'cl when compiling.
Glenn Morris <rgm@gnu.org>
parents:
93890
diff
changeset
|
790 (set (make-local-variable 'copyright-at-end-flag) t) |
21719
c888284a54f7
(change-log-mode): Add `* ' to paragraph-start.
Dave Love <fx@gnu.org>
parents:
21629
diff
changeset
|
791 ;; 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
|
792 ;; 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
|
793 ;; 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
|
794 ;; between entries for different files. |
21749
84df514f7719
(change-log-mode): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
21719
diff
changeset
|
795 (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
|
796 (set (make-local-variable 'paragraph-separate) paragraph-start) |
1078
15b4ed20e524
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1062
diff
changeset
|
797 ;; 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
|
798 ;; 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
|
799 (set (make-local-variable 'page-delimiter) "^\\<\\|^\f") |
678 | 800 (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
|
801 (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
|
802 'change-log-resolve-conflict) |
678 | 803 (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
|
804 (set (make-local-variable 'font-lock-defaults) |
85570
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
805 '(change-log-font-lock-keywords t nil nil backward-paragraph)) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
806 (set (make-local-variable 'isearch-buffers-next-buffer-function) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
807 'change-log-next-buffer) |
85650
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
808 (set (make-local-variable 'beginning-of-defun-function) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
809 'change-log-beginning-of-defun) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
810 (set (make-local-variable 'end-of-defun-function) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
811 'change-log-end-of-defun) |
85570
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
812 (isearch-buffers-minor-mode)) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
813 |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
814 (defun change-log-next-buffer (&optional buffer wrap) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
815 "Return the next buffer in the series of ChangeLog file buffers. |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
816 This function is used for multiple buffers isearch. |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
817 A sequence of buffers is formed by ChangeLog files with decreasing |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
818 numeric file name suffixes in the directory of the initial ChangeLog |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
819 file were isearch was started." |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
820 (let* ((name (change-log-name)) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
821 (files (cons name (sort (file-expand-wildcards |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
822 (concat name "[-.][0-9]*")) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
823 (lambda (a b) |
93890
5bd4e09f29d0
(change-log-next-buffer): Handle the case where version< signals an error.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93565
diff
changeset
|
824 ;; The file's extension may not have a valid |
5bd4e09f29d0
(change-log-next-buffer): Handle the case where version< signals an error.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93565
diff
changeset
|
825 ;; version form (e.g. VC backup revisions). |
5bd4e09f29d0
(change-log-next-buffer): Handle the case where version< signals an error.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93565
diff
changeset
|
826 (ignore-errors |
5bd4e09f29d0
(change-log-next-buffer): Handle the case where version< signals an error.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93565
diff
changeset
|
827 (version< (substring b (length name)) |
5bd4e09f29d0
(change-log-next-buffer): Handle the case where version< signals an error.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93565
diff
changeset
|
828 (substring a (length name)))))))) |
85570
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
829 (files (if isearch-forward files (reverse files)))) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
830 (find-file-noselect |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
831 (if wrap |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
832 (car files) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
833 (cadr (member (file-name-nondirectory (buffer-file-name buffer)) |
cd304d007007
(change-log-mode): Make and set buffer-local variable
Juri Linkov <juri@jurta.org>
parents:
85139
diff
changeset
|
834 files)))))) |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
835 |
4157
d2316090d029
(prompt-for-change-log-name): Autoload this (for vc-comment-to-change-log).
Roland McGrath <roland@gnu.org>
parents:
4154
diff
changeset
|
836 ;; 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
|
837 ;; 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
|
838 ;; 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
|
839 ;; 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
|
840 (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
|
841 "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
|
842 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
|
843 (interactive "P") |
16505
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
844 (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
|
845 (beg (progn (backward-paragraph) (point))) |
82017
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
846 ;; Add lines starting with whitespace followed by a left paren or an |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
847 ;; asterisk. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
848 (paragraph-start (concat paragraph-start "\\|\\s *\\(?:\\s(\\|\\*\\)")) |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
849 ;; Make sure we call `change-log-indent'. |
3ecefdb49ed0
(change-log-fill-parenthesized-list): New function.
Martin Rudalics <rudalics@gmx.at>
parents:
82007
diff
changeset
|
850 (fill-indent-according-to-mode t)) |
16505
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
851 (fill-region beg end justify) |
39efcea11aad
(change-log-fill-paragraph): Return non-nil so
Richard M. Stallman <rms@gnu.org>
parents:
16450
diff
changeset
|
852 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
|
853 |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
854 (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
|
855 "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]" |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
856 "Heuristic regexp used by `add-log-current-defun' for unknown major modes." |
17413
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
857 :type 'regexp |
9fa0ed8da0b1
Add defgroup's; use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents:
16505
diff
changeset
|
858 :group 'change-log) |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
859 |
6562
0541a368505c
(add-log-current-defun): Autoload this.
Roland McGrath <roland@gnu.org>
parents:
6309
diff
changeset
|
860 ;;;###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
|
861 (defvar add-log-lisp-like-modes |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
862 '(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
|
863 "*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
|
864 |
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
|
865 ;;;###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
|
866 (defvar add-log-c-like-modes |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
867 '(c-mode c++-mode c++-c-mode objc-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
|
868 "*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
|
869 |
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
|
870 ;;;###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
|
871 (defvar add-log-tex-like-modes |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
872 '(TeX-mode plain-TeX-mode LaTeX-mode tex-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
|
873 "*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
|
874 |
93565
622e5fddb043
(c-beginning-of-defun, c-end-of-defun): Remove declarations; no longer used.
Glenn Morris <rgm@gnu.org>
parents:
93557
diff
changeset
|
875 (declare-function c-cpp-define-name "cc-cmds" ()) |
622e5fddb043
(c-beginning-of-defun, c-end-of-defun): Remove declarations; no longer used.
Glenn Morris <rgm@gnu.org>
parents:
93557
diff
changeset
|
876 (declare-function c-defun-name "cc-cmds" ()) |
86234
860a7a8e779e
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85650
diff
changeset
|
877 |
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
|
878 ;;;###autoload |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
879 (defun add-log-current-defun () |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
880 "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
|
881 |
3499
6428162f137c
(add-log-current-defun): Fix typos in last change.
Richard M. Stallman <rms@gnu.org>
parents:
3486
diff
changeset
|
882 Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...), |
28446 | 883 Texinfo (@node titles) and Perl. |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
884 |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
885 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
|
886 point for uppercase headings starting in the first column or |
28446 | 887 identifiers followed by `:' or `='. See variables |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
888 `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
|
889 `add-log-current-defun-function'. |
666
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
890 |
7fa6b835da67
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
661
diff
changeset
|
891 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
|
892 (condition-case nil |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
893 (save-excursion |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
894 (let ((location (point))) |
28446 | 895 (cond (add-log-current-defun-function |
896 (funcall add-log-current-defun-function)) | |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
897 ((apply 'derived-mode-p 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
|
898 ;; 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
|
899 ;; 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
|
900 ;; rather than the previous one. |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
901 (or (eobp) (forward-char 1)) |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
902 (beginning-of-defun) |
28446 | 903 ;; Make sure we are really inside the defun found, |
904 ;; not after it. | |
21944
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
905 (when (and (looking-at "\\s(") |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
906 (progn (end-of-defun) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
907 (< location (point))) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
908 (progn (forward-sexp -1) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
909 (>= location (point)))) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
910 (if (looking-at "\\s(") |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
911 (forward-char 1)) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
912 ;; Skip the defining construct name, typically "defun" |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
913 ;; or "defvar". |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
914 (forward-sexp 1) |
8e606f5208eb
(add-log-current-defun) <lisp>:
Richard M. Stallman <rms@gnu.org>
parents:
21943
diff
changeset
|
915 ;; 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
|
916 ;; If it is not, use the first symbol in it. |
22018 | 917 (skip-chars-forward " \t\n'(") |
28446 | 918 (buffer-substring-no-properties (point) |
919 (progn (forward-sexp 1) | |
920 (point))))) | |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
921 ((apply 'derived-mode-p add-log-c-like-modes) |
93557
0757ce2515ac
(add-log-current-defun): Move the functionality which gets the current
Alan Mackenzie <acm@muc.de>
parents:
88036
diff
changeset
|
922 (or (c-cpp-define-name) |
0757ce2515ac
(add-log-current-defun): Move the functionality which gets the current
Alan Mackenzie <acm@muc.de>
parents:
88036
diff
changeset
|
923 (c-defun-name))) |
0757ce2515ac
(add-log-current-defun): Move the functionality which gets the current
Alan Mackenzie <acm@muc.de>
parents:
88036
diff
changeset
|
924 ((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
|
925 (if (re-search-backward |
28446 | 926 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" |
927 nil t) | |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
928 (progn |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
929 (goto-char (match-beginning 0)) |
28446 | 930 (buffer-substring-no-properties |
931 (1+ (point)) ; without initial backslash | |
932 (line-end-position))))) | |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
933 ((derived-mode-p 'texinfo-mode) |
9397
eba13d81ba0b
(add-log-current-defun): In texinfo-mode,
Richard M. Stallman <rms@gnu.org>
parents:
9377
diff
changeset
|
934 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t) |
28446 | 935 (match-string-no-properties 1))) |
84676
a5b42c90ed30
(add-log-current-defun): Fix thinko w.r.t derived-mode-p.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84370
diff
changeset
|
936 ((derived-mode-p '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
|
937 (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t) |
28446 | 938 (match-string-no-properties 1))) |
939 ;; Emacs's autoconf-mode installs its own | |
940 ;; `add-log-current-defun-function'. This applies to | |
941 ;; a different mode apparently for editing .m4 | |
942 ;; autoconf source. | |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
943 ((derived-mode-p 'autoconf-mode) |
28446 | 944 (if (re-search-backward |
945 "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t) | |
946 (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
|
947 (t |
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
948 ;; If all else fails, try heuristics |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
949 (let (case-fold-search |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
950 result) |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
951 (end-of-line) |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
952 (when (re-search-backward |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
953 add-log-current-defun-header-regexp |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
954 (- (point) 10000) |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
955 t) |
28446 | 956 (setq result (or (match-string-no-properties 1) |
957 (match-string-no-properties 0))) | |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
958 ;; Strip whitespace away |
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
959 (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
|
960 result) |
28446 | 961 (setq result (match-string-no-properties 1 result))) |
27277
9fdcfef41c64
(add-log-current-defun): Call
Gerd Moellmann <gerd@gnu.org>
parents:
27240
diff
changeset
|
962 result)))))) |
1447
75fa9ad982a5
(add-log-current-defun): Add condition-case around
Richard M. Stallman <rms@gnu.org>
parents:
1369
diff
changeset
|
963 (error nil))) |
999 | 964 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
965 (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
|
966 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
967 ;; 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
|
968 ;; 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
|
969 ;; 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
|
970 (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
|
971 (setq change-log-get-method-definition-md |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
972 (concat change-log-get-method-definition-md |
28446 | 973 (match-string 1) |
13282
69fe836d7f02
(get-method-definition, get-method-definition-1):
Richard M. Stallman <rms@gnu.org>
parents:
13255
diff
changeset
|
974 end)) |
11749
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
975 (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
|
976 |
20402
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
977 (defun change-log-get-method-definition () |
64315
b12b140acf8b
(add-log-mailing-address, change-log-merge): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
978 "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
|
979 (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
|
980 (save-excursion |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
981 (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
|
982 (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
|
983 (save-excursion |
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
984 (cond |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
985 ((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
|
986 (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
|
987 (while (not (looking-at "[{;]")) |
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
988 (looking-at |
11816
2a8e1b01bc15
(get-method-definition): Fix regexps.
Karl Heuer <kwzh@gnu.org>
parents:
11757
diff
changeset
|
989 "\\([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
|
990 (change-log-get-method-definition-1 "")) |
108100aa1991
(change-log-add-make-room): New function.
Karl Heuer <kwzh@gnu.org>
parents:
19904
diff
changeset
|
991 (concat change-log-get-method-definition-md "]")))))) |
27240 | 992 |
993 (defun change-log-sortable-date-at () | |
994 "Return date of log entry in a consistent form for sorting. | |
995 Point is assumed to be at the start of the entry." | |
996 (require 'timezone) | |
85650
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
997 (if (looking-at change-log-start-entry-re) |
27240 | 998 (let ((date (match-string-no-properties 0))) |
999 (if date | |
1000 (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date) | |
1001 (concat (match-string 1 date) (match-string 2 date) | |
1002 (match-string 3 date)) | |
1003 (condition-case nil | |
1004 (timezone-make-date-sortable date) | |
1005 (error nil))))) | |
1006 (error "Bad date"))) | |
11749
8da04214faed
(get-method-definition, get-method-definition-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
11517
diff
changeset
|
1007 |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1008 (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
|
1009 "Function to be used in `smerge-resolve-function'." |
82007
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1010 (save-excursion |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1011 (save-restriction |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1012 (narrow-to-region (match-beginning 0) (match-end 0)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1013 (let ((mb1 (match-beginning 1)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1014 (me1 (match-end 1)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1015 (mb3 (match-beginning 3)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1016 (me3 (match-end 3)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1017 (tmp1 (generate-new-buffer " *changelog-resolve-1*")) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1018 (tmp2 (generate-new-buffer " *changelog-resolve-2*"))) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1019 (unwind-protect |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1020 (let ((buf (current-buffer))) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1021 (with-current-buffer tmp1 |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1022 (change-log-mode) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1023 (insert-buffer-substring buf mb1 me1)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1024 (with-current-buffer tmp2 |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1025 (change-log-mode) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1026 (insert-buffer-substring buf mb3 me3) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1027 ;; Do the merge here instead of inside `buf' so as to be |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1028 ;; more robust in case change-log-merge fails. |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1029 (change-log-merge tmp1)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1030 (goto-char (point-max)) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1031 (delete-region (point-min) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1032 (prog1 (point) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1033 (insert-buffer-substring tmp2)))) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1034 (kill-buffer tmp1) |
c934794f2e69
(change-log-resolve-conflict): Don't lose data if the merge fails.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82005
diff
changeset
|
1035 (kill-buffer tmp2)))))) |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1036 |
27240 | 1037 ;;;###autoload |
1038 (defun change-log-merge (other-log) | |
64315
b12b140acf8b
(add-log-mailing-address, change-log-merge): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
1039 "Merge the contents of change log file OTHER-LOG with this buffer. |
27240 | 1040 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
|
1041 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
|
1042 or a buffer. |
27240 | 1043 |
30809 | 1044 Entries are inserted in chronological order. Both the current and |
1045 old-style time formats for entries are supported." | |
27240 | 1046 (interactive "*fLog file name to merge: ") |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
1047 (if (not (derived-mode-p 'change-log-mode)) |
27240 | 1048 (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
|
1049 (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
|
1050 (find-file-noselect other-log))) |
27240 | 1051 (buf (current-buffer)) |
1052 date1 start end) | |
1053 (save-excursion | |
1054 (goto-char (point-min)) | |
1055 (set-buffer other-buf) | |
1056 (goto-char (point-min)) | |
82005
0de2cd15c33d
(add-change-log-entry, add-log-current-defun, change-log-merge):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82003
diff
changeset
|
1057 (if (not (derived-mode-p 'change-log-mode)) |
27240 | 1058 (error "%s not found in Change Log mode" other-log)) |
1059 ;; Loop through all the entries in OTHER-LOG. | |
1060 (while (not (eobp)) | |
1061 (setq date1 (change-log-sortable-date-at)) | |
1062 (setq start (point) | |
1063 end (progn (forward-page) (point))) | |
1064 ;; Look for an entry in original buffer that isn't later. | |
1065 (with-current-buffer buf | |
1066 (while (and (not (eobp)) | |
1067 (string< date1 (change-log-sortable-date-at))) | |
1068 (forward-page)) | |
1069 (if (not (eobp)) | |
1070 (insert-buffer-substring other-buf start end) | |
1071 ;; At the end of the original buffer, insert a newline to | |
1072 ;; 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
|
1073 ;; merged. |
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1074 (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
|
1075 (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
|
1076 (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
|
1077 (= ?\n (char-before (1- (point))))))) |
68182
faf3f34b2d1c
(add-change-log-entry, change-log-merge):
Romain Francoise <romain@orebokech.com>
parents:
66965
diff
changeset
|
1078 (insert (if use-hard-newlines hard-newline "\n"))) |
47828
4944e0ddf992
(add-change-log-entry): Don't call find-file at all
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46637
diff
changeset
|
1079 ;; 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
|
1080 (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
|
1081 (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
|
1082 (insert-buffer-substring other-buf start))))))) |
999 | 1083 |
85650
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1084 (defun change-log-beginning-of-defun () |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1085 (re-search-backward change-log-start-entry-re nil 'move)) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1086 |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1087 (defun change-log-end-of-defun () |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1088 ;; Look back and if there is no entry there it means we are before |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1089 ;; the first ChangeLog entry, so go forward until finding one. |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1090 (unless (save-excursion (re-search-backward change-log-start-entry-re nil t)) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1091 (re-search-forward change-log-start-entry-re nil t)) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1092 |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1093 ;; In case we are at the end of log entry going forward a line will |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1094 ;; make us find the next entry when searching. If we are inside of |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1095 ;; an entry going forward a line will still keep the point inside |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1096 ;; the same entry. |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1097 (forward-line 1) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1098 |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1099 ;; In case we are at the beginning of an entry, move past it. |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1100 (when (looking-at change-log-start-entry-re) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1101 (goto-char (match-end 0)) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1102 (forward-line 1)) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1103 |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1104 ;; Search for the start of the next log entry. Go to the end of the |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1105 ;; buffer if we could not find a next entry. |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1106 (when (re-search-forward change-log-start-entry-re nil 'move) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1107 (goto-char (match-beginning 0)) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1108 (forward-line -1))) |
437a25964d35
* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85570
diff
changeset
|
1109 |
980
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
1110 (provide 'add-log) |
b62886fbf2a7
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
953
diff
changeset
|
1111 |
70217
377548b8f095
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
69818
diff
changeset
|
1112 ;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762 |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
678
diff
changeset
|
1113 ;;; add-log.el ends here |