annotate lisp/add-log.el @ 70617:af5bc6c80df2

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