annotate lisp/add-log.el @ 85669:5efb220d2a98

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