Commit | Line | Data |
---|---|---|
5abdc915 | 1 | ;;; add-log.el --- change log maintenance commands for Emacs |
84fc2cfa | 2 | |
e91081eb | 3 | ;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001, |
d7a0267c | 4 | ;; 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. |
84fc2cfa | 5 | |
6228c05b | 6 | ;; Maintainer: FSF |
df63ae66 | 7 | ;; Keywords: tools |
e9571d2a | 8 | |
84fc2cfa ER |
9 | ;; This file is part of GNU Emacs. |
10 | ||
11 | ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 | ;; it under the terms of the GNU General Public License as published by | |
fd7fa35a | 13 | ;; the Free Software Foundation; either version 2, or (at your option) |
84fc2cfa ER |
14 | ;; any later version. |
15 | ||
16 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 | ;; GNU General Public License for more details. | |
20 | ||
21 | ;; You should have received a copy of the GNU General Public License | |
b578f267 | 22 | ;; along with GNU Emacs; see the file COPYING. If not, write to the |
086add15 LK |
23 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 | ;; Boston, MA 02110-1301, USA. | |
84fc2cfa | 25 | |
e41b2db1 ER |
26 | ;;; Commentary: |
27 | ||
28 | ;; This facility is documented in the Emacs Manual. | |
29 | ||
fd7fa35a | 30 | ;;; Code: |
84fc2cfa | 31 | |
776d8e16 | 32 | (eval-when-compile |
5960adc7 | 33 | (require 'timezone)) |
3697b807 | 34 | |
fcad5199 | 35 | (defgroup change-log nil |
7b297602 | 36 | "Change log maintenance." |
fcad5199 | 37 | :group 'tools |
3697b807 | 38 | :link '(custom-manual "(emacs)Change Log") |
fcad5199 RS |
39 | :prefix "change-log-" |
40 | :prefix "add-log-") | |
84fc2cfa | 41 | |
fcad5199 RS |
42 | |
43 | (defcustom change-log-default-name nil | |
44 | "*Name of a change log file for \\[add-change-log-entry]." | |
45 | :type '(choice (const :tag "default" nil) | |
46 | string) | |
47 | :group 'change-log) | |
10b35c39 | 48 | (put 'change-log-default-name 'safe-local-variable 'string-or-null-p) |
fcad5199 | 49 | |
c3979f12 DL |
50 | (defcustom change-log-mode-hook nil |
51 | "Normal hook run by `change-log-mode'." | |
52 | :type 'hook | |
53 | :group 'change-log) | |
54 | ||
c882e115 RS |
55 | ;; Many modes set this variable, so avoid warnings. |
56 | ;;;###autoload | |
fcad5199 | 57 | (defcustom add-log-current-defun-function nil |
5960adc7 DL |
58 | "*If non-nil, function to guess name of surrounding function. |
59 | It is used by `add-log-current-defun' in preference to built-in rules. | |
60 | Returns function's name as a string, or nil if outside a function." | |
cea3855a | 61 | :type '(choice (const nil) function) |
fcad5199 | 62 | :group 'change-log) |
6258d3af | 63 | |
29db528b | 64 | ;;;###autoload |
fcad5199 | 65 | (defcustom add-log-full-name nil |
02ec1592 | 66 | "*Full name of user, for inclusion in ChangeLog daily headers. |
075a6629 | 67 | This defaults to the value returned by the function `user-full-name'." |
fcad5199 RS |
68 | :type '(choice (const :tag "Default" nil) |
69 | string) | |
70 | :group 'change-log) | |
02ec1592 | 71 | |
29db528b | 72 | ;;;###autoload |
fcad5199 | 73 | (defcustom add-log-mailing-address nil |
d1921057 | 74 | "Email addresses of user, for inclusion in ChangeLog headers. |
c1b3ae42 CW |
75 | This defaults to the value of `user-mail-address'. In addition to |
76 | being a simple string, this value can also be a list. All elements | |
77 | will be recognized as referring to the same user; when creating a new | |
78 | ChangeLog entry, one element will be chosen at random." | |
fcad5199 | 79 | :type '(choice (const :tag "Default" nil) |
24f4201f MR |
80 | (string :tag "String") |
81 | (repeat :tag "List of Strings" string)) | |
fcad5199 RS |
82 | :group 'change-log) |
83 | ||
df63ae66 | 84 | (defcustom add-log-time-format 'add-log-iso8601-time-string |
d1921057 | 85 | "Function that defines the time format. |
df63ae66 RS |
86 | For example, `add-log-iso8601-time-string', which gives the |
87 | date in international ISO 8601 format, | |
88 | and `current-time-string' are two valid values." | |
89 | :type '(radio (const :tag "International ISO 8601 format" | |
90 | add-log-iso8601-time-string) | |
91 | (const :tag "Old format, as returned by `current-time-string'" | |
92 | current-time-string) | |
93 | (function :tag "Other")) | |
94 | :group 'change-log) | |
02ec1592 | 95 | |
83afd62c | 96 | (defcustom add-log-keep-changes-together nil |
d1921057 | 97 | "If non-nil, normally keep day's log entries for one file together. |
3697b807 DL |
98 | |
99 | Log entries for a given file made with \\[add-change-log-entry] or | |
100 | \\[add-change-log-entry-other-window] will only be added to others \ | |
101 | for that file made | |
102 | today if this variable is non-nil or that file comes first in today's | |
103 | entries. Otherwise another entry for that file will be started. An | |
104 | original log: | |
105 | ||
106 | * foo (...): ... | |
107 | * bar (...): change 1 | |
83afd62c | 108 | |
3697b807 DL |
109 | in the latter case, \\[add-change-log-entry-other-window] in a \ |
110 | buffer visiting `bar', yields: | |
83afd62c | 111 | |
3697b807 DL |
112 | * bar (...): -!- |
113 | * foo (...): ... | |
114 | * bar (...): change 1 | |
83afd62c | 115 | |
3697b807 | 116 | and in the former: |
83afd62c | 117 | |
3697b807 DL |
118 | * foo (...): ... |
119 | * bar (...): change 1 | |
120 | (...): -!- | |
83afd62c | 121 | |
3697b807 DL |
122 | The NEW-ENTRY arg to `add-change-log-entry' can override the effect of |
123 | this variable." | |
124 | :version "20.3" | |
83afd62c KH |
125 | :type 'boolean |
126 | :group 'change-log) | |
127 | ||
598f34fa | 128 | (defcustom add-log-always-start-new-record nil |
d1921057 | 129 | "If non-nil, `add-change-log-entry' will always start a new record." |
bf247b6e | 130 | :version "22.1" |
598f34fa SS |
131 | :type 'boolean |
132 | :group 'change-log) | |
133 | ||
d68f7f1b | 134 | (defcustom add-log-buffer-file-name-function nil |
d1921057 | 135 | "If non-nil, function to call to identify the full filename of a buffer. |
d68f7f1b SM |
136 | This function is called with no argument. If this is nil, the default is to |
137 | use `buffer-file-name'." | |
cea3855a | 138 | :type '(choice (const nil) function) |
d68f7f1b SM |
139 | :group 'change-log) |
140 | ||
666f4056 | 141 | (defcustom add-log-file-name-function nil |
d1921057 | 142 | "If non-nil, function to call to identify the filename for a ChangeLog entry. |
075a6629 DL |
143 | This function is called with one argument, the value of variable |
144 | `buffer-file-name' in that buffer. If this is nil, the default is to | |
145 | use the file's name relative to the directory of the change log file." | |
cea3855a | 146 | :type '(choice (const nil) function) |
666f4056 RS |
147 | :group 'change-log) |
148 | ||
776d8e16 GM |
149 | |
150 | (defcustom change-log-version-info-enabled nil | |
151 | "*If non-nil, enable recording version numbers with the changes." | |
152 | :version "21.1" | |
153 | :type 'boolean | |
154 | :group 'change-log) | |
155 | ||
156 | (defcustom change-log-version-number-regexp-list | |
157 | (let ((re "\\([0-9]+\.[0-9.]+\\)")) | |
158 | (list | |
159 | ;; (defconst ad-version "2.15" | |
160 | (concat "^(def[^ \t\n]+[ \t]+[^ \t\n][ \t]\"" re) | |
161 | ;; Revision: pcl-cvs.el,v 1.72 1999/09/05 20:21:54 monnier Exp | |
5960adc7 | 162 | (concat "^;+ *Revision: +[^ \t\n]+[ \t]+" re))) |
776d8e16 | 163 | "*List of regexps to search for version number. |
5960adc7 | 164 | The version number must be in group 1. |
776d8e16 GM |
165 | Note: The search is conducted only within 10%, at the beginning of the file." |
166 | :version "21.1" | |
167 | :type '(repeat regexp) | |
168 | :group 'change-log) | |
169 | ||
fe735a8d | 170 | (defface change-log-date |
163f7b71 GM |
171 | '((t (:inherit font-lock-string-face))) |
172 | "Face used to highlight dates in date lines." | |
173 | :version "21.1" | |
174 | :group 'change-log) | |
fe735a8d MB |
175 | ;; backward-compatibility alias |
176 | (put 'change-log-date-face 'face-alias 'change-log-date) | |
163f7b71 | 177 | |
fe735a8d | 178 | (defface change-log-name |
163f7b71 GM |
179 | '((t (:inherit font-lock-constant-face))) |
180 | "Face for highlighting author names." | |
181 | :version "21.1" | |
182 | :group 'change-log) | |
fe735a8d MB |
183 | ;; backward-compatibility alias |
184 | (put 'change-log-name-face 'face-alias 'change-log-name) | |
163f7b71 | 185 | |
fe735a8d | 186 | (defface change-log-email |
163f7b71 GM |
187 | '((t (:inherit font-lock-variable-name-face))) |
188 | "Face for highlighting author email addresses." | |
189 | :version "21.1" | |
190 | :group 'change-log) | |
fe735a8d MB |
191 | ;; backward-compatibility alias |
192 | (put 'change-log-email-face 'face-alias 'change-log-email) | |
163f7b71 | 193 | |
fe735a8d | 194 | (defface change-log-file |
163f7b71 GM |
195 | '((t (:inherit font-lock-function-name-face))) |
196 | "Face for highlighting file names." | |
197 | :version "21.1" | |
198 | :group 'change-log) | |
fe735a8d MB |
199 | ;; backward-compatibility alias |
200 | (put 'change-log-file-face 'face-alias 'change-log-file) | |
163f7b71 | 201 | |
fe735a8d | 202 | (defface change-log-list |
163f7b71 GM |
203 | '((t (:inherit font-lock-keyword-face))) |
204 | "Face for highlighting parenthesized lists of functions or variables." | |
205 | :version "21.1" | |
206 | :group 'change-log) | |
fe735a8d MB |
207 | ;; backward-compatibility alias |
208 | (put 'change-log-list-face 'face-alias 'change-log-list) | |
598f34fa | 209 | |
fe735a8d | 210 | (defface change-log-conditionals |
163f7b71 GM |
211 | '((t (:inherit font-lock-variable-name-face))) |
212 | "Face for highlighting conditionals of the form `[...]'." | |
213 | :version "21.1" | |
214 | :group 'change-log) | |
fe735a8d MB |
215 | ;; backward-compatibility alias |
216 | (put 'change-log-conditionals-face 'face-alias 'change-log-conditionals) | |
163f7b71 | 217 | |
fe735a8d | 218 | (defface change-log-function |
163f7b71 GM |
219 | '((t (:inherit font-lock-variable-name-face))) |
220 | "Face for highlighting items of the form `<....>'." | |
221 | :version "21.1" | |
222 | :group 'change-log) | |
fe735a8d MB |
223 | ;; backward-compatibility alias |
224 | (put 'change-log-function-face 'face-alias 'change-log-function) | |
163f7b71 | 225 | |
fe735a8d | 226 | (defface change-log-acknowledgement |
163f7b71 GM |
227 | '((t (:inherit font-lock-comment-face))) |
228 | "Face for highlighting acknowledgments." | |
229 | :version "21.1" | |
230 | :group 'change-log) | |
fe735a8d MB |
231 | ;; backward-compatibility alias |
232 | (put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement) | |
776d8e16 | 233 | |
5f562719 | 234 | (defvar change-log-font-lock-keywords |
5572c1d1 | 235 | '(;; |
080525ae KH |
236 | ;; Date lines, new (2000-01-01) and old (Sat Jan 1 00:00:00 2000) styles. |
237 | ;; Fixme: this regepx is just an approximate one and may match | |
238 | ;; wrongly with a non-date line existing as a random note. In | |
239 | ;; addition, using any kind of fixed setting like this doesn't | |
240 | ;; work if a user customizes add-log-time-format. | |
241 | ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+" | |
242 | (0 'change-log-date-face) | |
97a3278b | 243 | ;; Name and e-mail; some people put e-mail in parens, not angles. |
7397a79f | 244 | ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil |
fe735a8d MB |
245 | (1 'change-log-name) |
246 | (2 'change-log-email))) | |
5572c1d1 SM |
247 | ;; |
248 | ;; File names. | |
9e4b54a0 | 249 | ("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)" |
fe735a8d | 250 | (2 'change-log-file) |
97a3278b | 251 | ;; Possibly further names in a list: |
fe735a8d | 252 | ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file)) |
97a3278b | 253 | ;; Possibly a parenthesized list of names: |
171c707b | 254 | ("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
fe735a8d | 255 | nil nil (1 'change-log-list)) |
171c707b | 256 | ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
fe735a8d | 257 | nil nil (1 'change-log-list))) |
5572c1d1 SM |
258 | ;; |
259 | ;; Function or variable names. | |
9e4b54a0 | 260 | ("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" |
fe735a8d | 261 | (2 'change-log-list) |
171c707b | 262 | ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil |
fe735a8d | 263 | (1 'change-log-list))) |
5572c1d1 SM |
264 | ;; |
265 | ;; Conditionals. | |
fe735a8d | 266 | ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals)) |
5572c1d1 | 267 | ;; |
a8d693d8 | 268 | ;; Function of change. |
fe735a8d | 269 | ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function)) |
a8d693d8 | 270 | ;; |
a3cab9f0 | 271 | ;; Acknowledgements. |
a8e10524 RS |
272 | ;; Don't include plain "From" because that is vague; |
273 | ;; we want to encourage people to say something more specific. | |
c50089c9 RS |
274 | ;; Note that the FSF does not use "Patches by"; our convention |
275 | ;; is to put the name of the author of the changes at the top | |
276 | ;; of the change log entry. | |
9e4b54a0 | 277 | ("\\(^\\( +\\|\t\\)\\| \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" |
fe735a8d | 278 | 3 'change-log-acknowledgement)) |
5f562719 RS |
279 | "Additional expressions to highlight in Change Log mode.") |
280 | ||
3066d4ad SM |
281 | (defvar change-log-mode-map |
282 | (let ((map (make-sparse-keymap))) | |
283 | (define-key map [?\C-c ?\C-p] 'add-log-edit-prev-comment) | |
284 | (define-key map [?\C-c ?\C-n] 'add-log-edit-next-comment) | |
285 | map) | |
45c50c5d | 286 | "Keymap for Change Log major mode.") |
45c50c5d | 287 | |
d1921057 SM |
288 | ;; It used to be called change-log-time-zone-rule but really should be |
289 | ;; called add-log-time-zone-rule since it's only used from add-log-* code. | |
290 | (defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule) | |
291 | (defvar add-log-time-zone-rule nil | |
51bd1843 EN |
292 | "Time zone used for calculating change log time stamps. |
293 | It takes the same format as the TZ argument of `set-time-zone-rule'. | |
d1921057 SM |
294 | If nil, use local time. |
295 | If t, use universal time.") | |
d52c204b RS |
296 | (put 'add-log-time-zone-rule 'safe-local-variable |
297 | '(lambda (x) (or (booleanp x) (stringp x)))) | |
51bd1843 | 298 | |
0739a962 | 299 | (defun add-log-iso8601-time-zone (&optional time) |
51bd1843 EN |
300 | (let* ((utc-offset (or (car (current-time-zone time)) 0)) |
301 | (sign (if (< utc-offset 0) ?- ?+)) | |
302 | (sec (abs utc-offset)) | |
303 | (ss (% sec 60)) | |
304 | (min (/ sec 60)) | |
305 | (mm (% min 60)) | |
306 | (hh (/ min 60))) | |
307 | (format (cond ((not (zerop ss)) "%c%02d:%02d:%02d") | |
308 | ((not (zerop mm)) "%c%02d:%02d") | |
309 | (t "%c%02d")) | |
310 | sign hh mm ss))) | |
311 | ||
d1921057 SM |
312 | (defvar add-log-iso8601-with-time-zone nil) |
313 | ||
df63ae66 | 314 | (defun add-log-iso8601-time-string () |
0739a962 SM |
315 | (let ((time (format-time-string "%Y-%m-%d" |
316 | nil (eq t add-log-time-zone-rule)))) | |
d1921057 SM |
317 | (if add-log-iso8601-with-time-zone |
318 | (concat time " " (add-log-iso8601-time-zone)) | |
319 | time))) | |
df63ae66 | 320 | |
84fc2cfa | 321 | (defun change-log-name () |
075a6629 | 322 | "Return (system-dependent) default name for a change log file." |
84fc2cfa | 323 | (or change-log-default-name |
513063cf | 324 | (if (eq system-type 'vax-vms) |
4a047d23 RS |
325 | "$CHANGE_LOG$.TXT" |
326 | "ChangeLog"))) | |
84fc2cfa | 327 | |
3066d4ad SM |
328 | (defun add-log-edit-prev-comment (arg) |
329 | "Cycle backward through Log-Edit mode comment history. | |
330 | With a numeric prefix ARG, go back ARG comments." | |
331 | (interactive "*p") | |
332 | (save-restriction | |
333 | (narrow-to-region (point) | |
334 | (if (memq last-command '(add-log-edit-prev-comment | |
335 | add-log-edit-next-comment)) | |
336 | (mark) (point))) | |
337 | (when (fboundp 'log-edit-previous-comment) | |
338 | (log-edit-previous-comment arg) | |
339 | (indent-region (point-min) (point-max)) | |
340 | (goto-char (point-min)) | |
341 | (unless (save-restriction (widen) (bolp)) | |
342 | (delete-region (point) (progn (skip-chars-forward " \t\n") (point)))) | |
343 | (set-mark (point-min)) | |
344 | (goto-char (point-max)) | |
345 | (delete-region (point) (progn (skip-chars-backward " \t\n") (point)))))) | |
346 | ||
347 | (defun add-log-edit-next-comment (arg) | |
348 | "Cycle forward through Log-Edit mode comment history. | |
349 | With a numeric prefix ARG, go back ARG comments." | |
350 | (interactive "*p") | |
351 | (add-log-edit-prev-comment (- arg))) | |
352 | ||
287d149f | 353 | ;;;###autoload |
84fc2cfa ER |
354 | (defun prompt-for-change-log-name () |
355 | "Prompt for a change log name." | |
117aaf60 KH |
356 | (let* ((default (change-log-name)) |
357 | (name (expand-file-name | |
358 | (read-file-name (format "Log file (default %s): " default) | |
359 | nil default)))) | |
360 | ;; Handle something that is syntactically a directory name. | |
361 | ;; Look for ChangeLog or whatever in that directory. | |
362 | (if (string= (file-name-nondirectory name) "") | |
363 | (expand-file-name (file-name-nondirectory default) | |
364 | name) | |
365 | ;; Handle specifying a file that is a directory. | |
366 | (if (file-directory-p name) | |
367 | (expand-file-name (file-name-nondirectory default) | |
368 | (file-name-as-directory name)) | |
369 | name)))) | |
84fc2cfa | 370 | |
776d8e16 | 371 | (defun change-log-version-number-search () |
5960adc7 DL |
372 | "Return version number of current buffer's file. |
373 | This is the value returned by `vc-workfile-version' or, if that is | |
374 | nil, by matching `change-log-version-number-regexp-list'." | |
776d8e16 | 375 | (let* ((size (buffer-size)) |
fc9b0554 | 376 | (limit |
5960adc7 DL |
377 | ;; The version number can be anywhere in the file, but |
378 | ;; restrict search to the file beginning: 10% should be | |
379 | ;; enough to prevent some mishits. | |
776d8e16 | 380 | ;; |
5960adc7 DL |
381 | ;; Apply percentage only if buffer size is bigger than |
382 | ;; approx 100 lines. | |
fc9b0554 | 383 | (if (> size (* 100 80)) (+ (point) (/ size 10))))) |
d68f7f1b | 384 | (or (and buffer-file-name (vc-workfile-version buffer-file-name)) |
5960adc7 DL |
385 | (save-restriction |
386 | (widen) | |
fc9b0554 SM |
387 | (let ((regexps change-log-version-number-regexp-list) |
388 | version) | |
5960adc7 DL |
389 | (while regexps |
390 | (save-excursion | |
391 | (goto-char (point-min)) | |
fc9b0554 | 392 | (when (re-search-forward (pop regexps) limit t) |
5960adc7 | 393 | (setq version (match-string 1) |
fc9b0554 SM |
394 | regexps nil)))) |
395 | version))))) | |
776d8e16 GM |
396 | |
397 | ||
45a13f0d | 398 | ;;;###autoload |
d68f7f1b | 399 | (defun find-change-log (&optional file-name buffer-file) |
45a13f0d | 400 | "Find a change log file for \\[add-change-log-entry] and return the name. |
a82e2ed5 RS |
401 | |
402 | Optional arg FILE-NAME specifies the file to use. | |
de98fcaf | 403 | If FILE-NAME is nil, use the value of `change-log-default-name'. |
218cf475 | 404 | If `change-log-default-name' is nil, behave as though it were 'ChangeLog' |
de98fcaf RS |
405 | \(or whatever we use on this operating system). |
406 | ||
218cf475 | 407 | If `change-log-default-name' contains a leading directory component, then |
513063cf | 408 | simply find it in the current directory. Otherwise, search in the current |
de98fcaf | 409 | directory and its successive parents for a file so named. |
45a13f0d RM |
410 | |
411 | Once a file is found, `change-log-default-name' is set locally in the | |
d68f7f1b SM |
412 | current buffer to the complete file name. |
413 | Optional arg BUFFER-FILE overrides `buffer-file-name'." | |
a82e2ed5 RS |
414 | ;; If user specified a file name or if this buffer knows which one to use, |
415 | ;; just use that. | |
45a13f0d | 416 | (or file-name |
de98fcaf RS |
417 | (setq file-name (and change-log-default-name |
418 | (file-name-directory change-log-default-name) | |
419 | change-log-default-name)) | |
a82e2ed5 RS |
420 | (progn |
421 | ;; Chase links in the source file | |
422 | ;; and use the change log in the dir where it points. | |
d68f7f1b | 423 | (setq file-name (or (and (or buffer-file buffer-file-name) |
a82e2ed5 | 424 | (file-name-directory |
d68f7f1b SM |
425 | (file-chase-links |
426 | (or buffer-file buffer-file-name)))) | |
a82e2ed5 RS |
427 | default-directory)) |
428 | (if (file-directory-p file-name) | |
429 | (setq file-name (expand-file-name (change-log-name) file-name))) | |
430 | ;; Chase links before visiting the file. | |
431 | ;; This makes it easier to use a single change log file | |
432 | ;; for several related directories. | |
433 | (setq file-name (file-chase-links file-name)) | |
434 | (setq file-name (expand-file-name file-name)) | |
435 | ;; Move up in the dir hierarchy till we find a change log file. | |
436 | (let ((file1 file-name) | |
437 | parent-dir) | |
438 | (while (and (not (or (get-file-buffer file1) (file-exists-p file1))) | |
439 | (progn (setq parent-dir | |
440 | (file-name-directory | |
441 | (directory-file-name | |
442 | (file-name-directory file1)))) | |
443 | ;; Give up if we are already at the root dir. | |
444 | (not (string= (file-name-directory file1) | |
445 | parent-dir)))) | |
446 | ;; Move up to the parent dir and try again. | |
513063cf | 447 | (setq file1 (expand-file-name |
a82e2ed5 RS |
448 | (file-name-nondirectory (change-log-name)) |
449 | parent-dir))) | |
450 | ;; If we found a change log in a parent, use that. | |
451 | (if (or (get-file-buffer file1) (file-exists-p file1)) | |
452 | (setq file-name file1))))) | |
453 | ;; Make a local variable in this buffer so we needn't search again. | |
454 | (set (make-local-variable 'change-log-default-name) file-name) | |
455 | file-name) | |
45a13f0d | 456 | |
2eb7ccf4 SM |
457 | (defun add-log-file-name (buffer-file log-file) |
458 | ;; Never want to add a change log entry for the ChangeLog file itself. | |
459 | (unless (or (null buffer-file) (string= buffer-file log-file)) | |
d68f7f1b SM |
460 | (if add-log-file-name-function |
461 | (funcall add-log-file-name-function buffer-file) | |
462 | (setq buffer-file | |
463 | (if (string-match | |
464 | (concat "^" (regexp-quote (file-name-directory log-file))) | |
465 | buffer-file) | |
466 | (substring buffer-file (match-end 0)) | |
467 | (file-name-nondirectory buffer-file))) | |
468 | ;; If we have a backup file, it's presumably because we're | |
469 | ;; comparing old and new versions (e.g. for deleted | |
470 | ;; functions) and we'll want to use the original name. | |
471 | (if (backup-file-name-p buffer-file) | |
472 | (file-name-sans-versions buffer-file) | |
473 | buffer-file)))) | |
2eb7ccf4 | 474 | |
84fc2cfa | 475 | ;;;###autoload |
287d149f | 476 | (defun add-change-log-entry (&optional whoami file-name other-window new-entry) |
d882f144 | 477 | "Find change log file, and add an entry for today and an item for this file. |
83afd62c | 478 | Optional arg WHOAMI (interactive prefix) non-nil means prompt for user |
d9ee5172 | 479 | name and email (stored in `add-log-full-name' and `add-log-mailing-address'). |
83afd62c | 480 | |
d882f144 RS |
481 | Second arg FILE-NAME is file name of the change log. |
482 | If nil, use the value of `change-log-default-name'. | |
483 | ||
287d149f | 484 | Third arg OTHER-WINDOW non-nil means visit in other window. |
d882f144 | 485 | |
287d149f | 486 | Fourth arg NEW-ENTRY non-nil means always create a new entry at the front; |
3697b807 DL |
487 | never append to an existing entry. Option `add-log-keep-changes-together' |
488 | otherwise affects whether a new entry is created. | |
489 | ||
598f34fa SS |
490 | Option `add-log-always-start-new-record' non-nil means always create a |
491 | new record, even when the last record was made on the same date and by | |
492 | the same person. | |
493 | ||
d882f144 RS |
494 | The change log file can start with a copyright notice and a copying |
495 | permission notice. The first blank line indicates the end of these | |
496 | notices. | |
497 | ||
d1921057 | 498 | Today's date is calculated according to `add-log-time-zone-rule' if |
3697b807 | 499 | non-nil, otherwise in local time." |
84fc2cfa ER |
500 | (interactive (list current-prefix-arg |
501 | (prompt-for-change-log-name))) | |
d68f7f1b SM |
502 | (let* ((defun (add-log-current-defun)) |
503 | (version (and change-log-version-info-enabled | |
504 | (change-log-version-number-search))) | |
8f530b95 SM |
505 | (buf-file-name (if add-log-buffer-file-name-function |
506 | (funcall add-log-buffer-file-name-function) | |
507 | buffer-file-name)) | |
508 | (buffer-file (if buf-file-name (expand-file-name buf-file-name))) | |
dd816e0d | 509 | (file-name (expand-file-name (find-change-log file-name buffer-file))) |
d882f144 RS |
510 | ;; Set ITEM to the file name to use in the new item. |
511 | (item (add-log-file-name buffer-file file-name)) | |
563631fe RS |
512 | bound |
513 | (full-name (or add-log-full-name (user-full-name))) | |
514 | (mailing-address (or add-log-mailing-address user-mail-address))) | |
515 | ||
516 | (if whoami | |
517 | (progn | |
3981e5b5 | 518 | (setq full-name (read-string "Full name: " full-name)) |
563631fe RS |
519 | ;; Note that some sites have room and phone number fields in |
520 | ;; full name which look silly when inserted. Rather than do | |
521 | ;; anything about that here, let user give prefix argument so that | |
522 | ;; s/he can edit the full name field in prompter if s/he wants. | |
523 | (setq mailing-address | |
3981e5b5 | 524 | (read-string "Mailing address: " mailing-address)))) |
2eb7ccf4 | 525 | |
7cd017ba SM |
526 | (unless (equal file-name buffer-file-name) |
527 | (if (or other-window (window-dedicated-p (selected-window))) | |
528 | (find-file-other-window file-name) | |
529 | (find-file file-name))) | |
675a998f RS |
530 | (or (eq major-mode 'change-log-mode) |
531 | (change-log-mode)) | |
84fc2cfa ER |
532 | (undo-boundary) |
533 | (goto-char (point-min)) | |
d882f144 RS |
534 | |
535 | ;; If file starts with a copyright and permission notice, skip them. | |
536 | ;; Assume they end at first blank line. | |
537 | (when (looking-at "Copyright") | |
538 | (search-forward "\n\n") | |
539 | (skip-chars-forward "\n")) | |
540 | ||
541 | ;; Advance into first entry if it is usable; else make new one. | |
d1921057 SM |
542 | (let ((new-entries |
543 | (mapcar (lambda (addr) | |
544 | (concat | |
545 | (if (stringp add-log-time-zone-rule) | |
546 | (let ((tz (getenv "TZ"))) | |
547 | (unwind-protect | |
548 | (progn | |
549 | (set-time-zone-rule add-log-time-zone-rule) | |
550 | (funcall add-log-time-format)) | |
551 | (set-time-zone-rule tz))) | |
552 | (funcall add-log-time-format)) | |
553 | " " full-name | |
554 | " <" addr ">")) | |
555 | (if (consp mailing-address) | |
556 | mailing-address | |
557 | (list mailing-address))))) | |
598f34fa | 558 | (if (and (not add-log-always-start-new-record) |
c1b3ae42 CW |
559 | (let ((hit nil)) |
560 | (dolist (entry new-entries hit) | |
561 | (when (looking-at (regexp-quote entry)) | |
562 | (setq hit t))))) | |
51bd1843 | 563 | (forward-line 1) |
c1b3ae42 CW |
564 | (insert (nth (random (length new-entries)) |
565 | new-entries) | |
97f4e87c RF |
566 | (if use-hard-newlines hard-newline "\n") |
567 | (if use-hard-newlines hard-newline "\n")) | |
d882f144 | 568 | (forward-line -1))) |
82f4acaf | 569 | |
d882f144 RS |
570 | ;; Determine where we should stop searching for a usable |
571 | ;; item to add to, within this entry. | |
3697b807 | 572 | (setq bound |
d882f144 | 573 | (save-excursion |
3697b807 DL |
574 | (if (looking-at "\n*[^\n* \t]") |
575 | (skip-chars-forward "\n") | |
576 | (if add-log-keep-changes-together | |
577 | (forward-page) ; page delimits entries for date | |
578 | (forward-paragraph))) ; paragraph delimits entries for file | |
579 | (point))) | |
d882f144 RS |
580 | |
581 | ;; Now insert the new line for this item. | |
3697b807 | 582 | (cond ((re-search-forward "^\\s *\\*\\s *$" bound t) |
d882f144 RS |
583 | ;; Put this file name into the existing empty item. |
584 | (if item | |
585 | (insert item))) | |
287d149f | 586 | ((and (not new-entry) |
e172f546 KH |
587 | (let (case-fold-search) |
588 | (re-search-forward | |
d882f144 | 589 | (concat (regexp-quote (concat "* " item)) |
e172f546 KH |
590 | ;; Don't accept `foo.bar' when |
591 | ;; looking for `foo': | |
592 | "\\(\\s \\|[(),:]\\)") | |
3697b807 | 593 | bound t))) |
d882f144 | 594 | ;; Add to the existing item for the same file. |
82f4acaf | 595 | (re-search-forward "^\\s *$\\|^\\s \\*") |
e172f546 | 596 | (goto-char (match-beginning 0)) |
3697b807 DL |
597 | ;; Delete excess empty lines; make just 2. |
598 | (while (and (not (eobp)) (looking-at "^\\s *$")) | |
5960adc7 | 599 | (delete-region (point) (line-beginning-position 2))) |
97f4e87c RF |
600 | (insert (if use-hard-newlines hard-newline "\n") |
601 | (if use-hard-newlines hard-newline "\n")) | |
3697b807 DL |
602 | (forward-line -2) |
603 | (indent-relative-maybe)) | |
21d7e080 | 604 | (t |
d882f144 | 605 | ;; Make a new item. |
dd309224 RM |
606 | (while (looking-at "\\sW") |
607 | (forward-line 1)) | |
09b389d0 | 608 | (while (and (not (eobp)) (looking-at "^\\s *$")) |
5960adc7 | 609 | (delete-region (point) (line-beginning-position 2))) |
97f4e87c RF |
610 | (insert (if use-hard-newlines hard-newline "\n") |
611 | (if use-hard-newlines hard-newline "\n") | |
612 | (if use-hard-newlines hard-newline "\n")) | |
1832dbd1 | 613 | (forward-line -2) |
dd309224 | 614 | (indent-to left-margin) |
918f4ac3 | 615 | (insert "* ") |
d882f144 | 616 | (if item (insert item)))) |
1832dbd1 | 617 | ;; Now insert the function name, if we have one. |
d882f144 | 618 | ;; Point is at the item for this file, |
21d7e080 | 619 | ;; either at the end of the line or at the first blank line. |
5a9ac14b SM |
620 | (if (not defun) |
621 | ;; No function name, so put in a colon unless we have just a star. | |
622 | (unless (save-excursion | |
623 | (beginning-of-line 1) | |
624 | (looking-at "\\s *\\(\\*\\s *\\)?$")) | |
625 | (insert ": ") | |
7b297602 | 626 | (if version (insert version ?\s))) |
5a9ac14b SM |
627 | ;; Make it easy to get rid of the function name. |
628 | (undo-boundary) | |
5960adc7 DL |
629 | (unless (save-excursion |
630 | (beginning-of-line 1) | |
5a9ac14b | 631 | (looking-at "\\s *$")) |
7b297602 | 632 | (insert ?\s)) |
5a9ac14b SM |
633 | ;; See if the prev function name has a message yet or not. |
634 | ;; If not, merge the two items. | |
635 | (let ((pos (point-marker))) | |
636 | (skip-syntax-backward " ") | |
637 | (skip-chars-backward "):") | |
638 | (if (and (looking-at "):") | |
fc9b0554 SM |
639 | (let ((pos (save-excursion (backward-sexp 1) (point)))) |
640 | (when (equal (buffer-substring pos (point)) defun) | |
641 | (delete-region pos (point))) | |
642 | (> fill-column (+ (current-column) (length defun) 4)))) | |
643 | (progn (skip-chars-backward ", ") | |
644 | (delete-region (point) pos) | |
645 | (unless (memq (char-before) '(?\()) (insert ", "))) | |
5a9ac14b SM |
646 | (if (looking-at "):") |
647 | (delete-region (+ 1 (point)) (line-end-position))) | |
648 | (goto-char pos) | |
649 | (insert "(")) | |
650 | (set-marker pos nil)) | |
651 | (insert defun "): ") | |
7b297602 | 652 | (if version (insert version ?\s))))) |
84fc2cfa | 653 | |
84fc2cfa ER |
654 | ;;;###autoload |
655 | (defun add-change-log-entry-other-window (&optional whoami file-name) | |
d882f144 RS |
656 | "Find change log file in other window and add entry and item. |
657 | This is just like `add-change-log-entry' except that it displays | |
658 | the change log file in another window." | |
84fc2cfa ER |
659 | (interactive (if current-prefix-arg |
660 | (list current-prefix-arg | |
661 | (prompt-for-change-log-name)))) | |
662 | (add-change-log-entry whoami file-name t)) | |
82f4acaf | 663 | ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window) |
84fc2cfa | 664 | |
d1921057 | 665 | (defvar change-log-indent-text 0) |
fc9b0554 | 666 | |
d1921057 | 667 | (defun change-log-indent () |
fc9b0554 SM |
668 | (let* ((indent |
669 | (save-excursion | |
670 | (beginning-of-line) | |
671 | (skip-chars-forward " \t") | |
672 | (cond | |
d1921057 | 673 | ((and (looking-at "\\(.*\\) [^ \n].*[^ \n] <.*>\\(?: +(.*)\\)? *$") |
fc9b0554 SM |
674 | ;; Matching the output of add-log-time-format is difficult, |
675 | ;; but I'll get it has at least two adjacent digits. | |
676 | (string-match "[[:digit:]][[:digit:]]" (match-string 1))) | |
677 | 0) | |
678 | ((looking-at "[^*(]") | |
d1921057 | 679 | (+ (current-left-margin) change-log-indent-text)) |
fc9b0554 SM |
680 | (t (current-left-margin))))) |
681 | (pos (save-excursion (indent-line-to indent) (point)))) | |
682 | (if (> pos (point)) (goto-char pos)))) | |
683 | ||
684 | ||
3066d4ad SM |
685 | (defvar smerge-resolve-function) |
686 | ||
1da56800 | 687 | ;;;###autoload |
7cd017ba | 688 | (define-derived-mode change-log-mode text-mode "Change Log" |
eb8c3be9 | 689 | "Major mode for editing change logs; like Indented Text Mode. |
09b389d0 | 690 | Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74. |
3697b807 | 691 | New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window]. |
5516387c | 692 | Each entry behaves as a paragraph, and the entries for one day as a page. |
3066d4ad SM |
693 | Runs `change-log-mode-hook'. |
694 | \\{change-log-mode-map}" | |
7cd017ba | 695 | (setq left-margin 8 |
4f675a8c | 696 | fill-column 74 |
60f10a06 KH |
697 | indent-tabs-mode t |
698 | tab-width 8) | |
699 | (set (make-local-variable 'fill-paragraph-function) | |
700 | 'change-log-fill-paragraph) | |
d1921057 | 701 | (set (make-local-variable 'indent-line-function) 'change-log-indent) |
fc9b0554 | 702 | (set (make-local-variable 'tab-always-indent) nil) |
4b7d4d0d DL |
703 | ;; We really do want "^" in paragraph-start below: it is only the |
704 | ;; lines that begin at column 0 (despite the left-margin of 8) that | |
705 | ;; we are looking for. Adding `* ' allows eliding the blank line | |
706 | ;; between entries for different files. | |
c9cfb0f2 | 707 | (set (make-local-variable 'paragraph-start) "\\s *$\\|\f\\|^\\<") |
4b7d4d0d | 708 | (set (make-local-variable 'paragraph-separate) paragraph-start) |
2c91c85c RS |
709 | ;; Match null string on the date-line so that the date-line |
710 | ;; is grouped with what follows. | |
964141f2 | 711 | (set (make-local-variable 'page-delimiter) "^\\<\\|^\f") |
dd309224 | 712 | (set (make-local-variable 'version-control) 'never) |
7cd017ba SM |
713 | (set (make-local-variable 'smerge-resolve-function) |
714 | 'change-log-resolve-conflict) | |
dd309224 | 715 | (set (make-local-variable 'adaptive-fill-regexp) "\\s *") |
4b286eca | 716 | (set (make-local-variable 'font-lock-defaults) |
7cd017ba | 717 | '(change-log-font-lock-keywords t nil nil backward-paragraph))) |
21d7e080 | 718 | |
287d149f RM |
719 | ;; It might be nice to have a general feature to replace this. The idea I |
720 | ;; have is a variable giving a regexp matching text which should not be | |
721 | ;; moved from bol by filling. change-log-mode would set this to "^\\s *\\s(". | |
722 | ;; But I don't feel up to implementing that today. | |
723 | (defun change-log-fill-paragraph (&optional justify) | |
724 | "Fill the paragraph, but preserve open parentheses at beginning of lines. | |
725 | Prefix arg means justify as well." | |
726 | (interactive "P") | |
8d6467a4 RS |
727 | (let ((end (progn (forward-paragraph) (point))) |
728 | (beg (progn (backward-paragraph) (point))) | |
14ee1953 | 729 | (paragraph-start (concat paragraph-start "\\|\\s *\\s("))) |
8d6467a4 RS |
730 | (fill-region beg end justify) |
731 | t)) | |
287d149f | 732 | \f |
fcad5199 | 733 | (defcustom add-log-current-defun-header-regexp |
a8d693d8 | 734 | "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]" |
d1921057 | 735 | "Heuristic regexp used by `add-log-current-defun' for unknown major modes." |
fcad5199 RS |
736 | :type 'regexp |
737 | :group 'change-log) | |
21d7e080 | 738 | |
fb644f48 EN |
739 | ;;;###autoload |
740 | (defvar add-log-lisp-like-modes | |
d1921057 | 741 | '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode) |
fb644f48 EN |
742 | "*Modes that look like Lisp to `add-log-current-defun'.") |
743 | ||
744 | ;;;###autoload | |
745 | (defvar add-log-c-like-modes | |
d1921057 | 746 | '(c-mode c++-mode c++-c-mode objc-mode) |
fb644f48 EN |
747 | "*Modes that look like C to `add-log-current-defun'.") |
748 | ||
749 | ;;;###autoload | |
750 | (defvar add-log-tex-like-modes | |
d1921057 | 751 | '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode) |
fb644f48 EN |
752 | "*Modes that look like TeX to `add-log-current-defun'.") |
753 | ||
e332f80b | 754 | ;;;###autoload |
21d7e080 ER |
755 | (defun add-log-current-defun () |
756 | "Return name of function definition point is in, or nil. | |
757 | ||
63314951 | 758 | Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...), |
5960adc7 | 759 | Texinfo (@node titles) and Perl. |
21d7e080 ER |
760 | |
761 | Other modes are handled by a heuristic that looks in the 10K before | |
762 | point for uppercase headings starting in the first column or | |
5960adc7 | 763 | identifiers followed by `:' or `='. See variables |
c1356086 | 764 | `add-log-current-defun-header-regexp' and |
5ef08021 | 765 | `add-log-current-defun-function'. |
21d7e080 ER |
766 | |
767 | Has a preference of looking backwards." | |
2cc0b765 RS |
768 | (condition-case nil |
769 | (save-excursion | |
770 | (let ((location (point))) | |
5960adc7 DL |
771 | (cond (add-log-current-defun-function |
772 | (funcall add-log-current-defun-function)) | |
c1356086 | 773 | ((memq major-mode add-log-lisp-like-modes) |
a0151877 | 774 | ;; If we are now precisely at the beginning of a defun, |
2cc0b765 RS |
775 | ;; make sure beginning-of-defun finds that one |
776 | ;; rather than the previous one. | |
777 | (or (eobp) (forward-char 1)) | |
778 | (beginning-of-defun) | |
5960adc7 DL |
779 | ;; Make sure we are really inside the defun found, |
780 | ;; not after it. | |
42b1fc29 RS |
781 | (when (and (looking-at "\\s(") |
782 | (progn (end-of-defun) | |
783 | (< location (point))) | |
784 | (progn (forward-sexp -1) | |
785 | (>= location (point)))) | |
786 | (if (looking-at "\\s(") | |
787 | (forward-char 1)) | |
788 | ;; Skip the defining construct name, typically "defun" | |
789 | ;; or "defvar". | |
790 | (forward-sexp 1) | |
791 | ;; The second element is usually a symbol being defined. | |
792 | ;; If it is not, use the first symbol in it. | |
63c7727f | 793 | (skip-chars-forward " \t\n'(") |
5960adc7 DL |
794 | (buffer-substring-no-properties (point) |
795 | (progn (forward-sexp 1) | |
796 | (point))))) | |
fb644f48 EN |
797 | ((and (memq major-mode add-log-c-like-modes) |
798 | (save-excursion | |
799 | (beginning-of-line) | |
800 | ;; Use eq instead of = here to avoid | |
801 | ;; error when at bob and char-after | |
802 | ;; returns nil. | |
803 | (while (eq (char-after (- (point) 2)) ?\\) | |
804 | (forward-line -1)) | |
805 | (looking-at "[ \t]*#[ \t]*define[ \t]"))) | |
2cc0b765 RS |
806 | ;; Handle a C macro definition. |
807 | (beginning-of-line) | |
808 | (while (eq (char-after (- (point) 2)) ?\\) ;not =; note above | |
809 | (forward-line -1)) | |
810 | (search-forward "define") | |
811 | (skip-chars-forward " \t") | |
5960adc7 DL |
812 | (buffer-substring-no-properties (point) |
813 | (progn (forward-sexp 1) | |
814 | (point)))) | |
fb644f48 | 815 | ((memq major-mode add-log-c-like-modes) |
6cbe2ec4 RS |
816 | ;; See whether the point is inside a defun. |
817 | (let (having-previous-defun | |
818 | having-next-defun | |
819 | previous-defun-end | |
820 | next-defun-beginning) | |
821 | ||
822 | (save-excursion | |
823 | (setq having-previous-defun | |
824 | (c-beginning-of-defun)) | |
825 | (c-end-of-defun) | |
826 | ;; `c-end-of-defun' moves point to the line after | |
827 | ;; the function close, but the position we prefer | |
828 | ;; here is the position after the final }. | |
829 | (backward-sexp 1) | |
830 | (forward-sexp 1) | |
831 | (setq previous-defun-end (point))) | |
832 | ||
833 | (save-excursion | |
834 | (setq having-next-defun | |
835 | (c-end-of-defun)) | |
836 | (c-beginning-of-defun) | |
837 | (setq next-defun-beginning (point))) | |
838 | ||
839 | (if (and having-next-defun | |
840 | (< location next-defun-beginning)) | |
841 | (skip-syntax-forward " ")) | |
842 | (if (and having-previous-defun | |
843 | (> location previous-defun-end)) | |
844 | (skip-syntax-backward " ")) | |
845 | (unless (or | |
846 | ;; When there is no previous defun, the | |
847 | ;; point is not in a defun if it is not at | |
848 | ;; the beginning of the next defun. | |
849 | (and (not having-previous-defun) | |
850 | (not (= (point) | |
851 | next-defun-beginning))) | |
852 | ;; When there is no next defun, the point | |
853 | ;; is not in a defun if it is not at the | |
854 | ;; end of the previous defun. | |
855 | (and (not having-next-defun) | |
856 | (not (= (point) | |
857 | previous-defun-end))) | |
858 | ;; If the point is between two defuns, it | |
859 | ;; is not in a defun. | |
860 | (and (> (point) previous-defun-end) | |
861 | (< (point) next-defun-beginning))) | |
862 | ;; If the point is already at the beginning of a | |
863 | ;; defun, there is no need to move point again. | |
864 | (if (not (= (point) next-defun-beginning)) | |
865 | (c-beginning-of-defun)) | |
faf142ec RS |
866 | ;; Is this a DEFUN construct? And is LOCATION in it? |
867 | (if (and (looking-at "DEFUN\\b") | |
868 | (>= location (point))) | |
568ec09d SS |
869 | ;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory |
870 | ;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK | |
5960adc7 | 871 | (progn |
5960adc7 | 872 | (down-list 1) |
568ec09d SS |
873 | (when (= (char-after (point)) ?\") |
874 | (forward-sexp 1) | |
875 | (search-forward ",")) | |
876 | (skip-syntax-forward " ") | |
5960adc7 DL |
877 | (buffer-substring-no-properties |
878 | (point) | |
568ec09d SS |
879 | (progn (search-forward ",") |
880 | (forward-char -1) | |
881 | (skip-syntax-backward " ") | |
5960adc7 DL |
882 | (point)))) |
883 | (if (looking-at "^[+-]") | |
94b073f3 | 884 | ;; Objective-C |
5960adc7 DL |
885 | (change-log-get-method-definition) |
886 | ;; Ordinary C function syntax. | |
6cbe2ec4 RS |
887 | (let ((beg (point))) |
888 | (if (and | |
889 | ;; Protect against "Unbalanced parens" error. | |
890 | (condition-case nil | |
891 | (progn | |
892 | (down-list 1) ; into arglist | |
893 | (backward-up-list 1) | |
894 | (skip-chars-backward " \t") | |
895 | t) | |
896 | (error nil)) | |
897 | ;; Verify initial pos was after | |
898 | ;; real start of function. | |
899 | (save-excursion | |
900 | (goto-char beg) | |
901 | ;; For this purpose, include the line | |
902 | ;; that has the decl keywords. This | |
903 | ;; may also include some of the | |
904 | ;; comments before the function. | |
905 | (while (and (not (bobp)) | |
906 | (save-excursion | |
907 | (forward-line -1) | |
908 | (looking-at "[^\n\f]"))) | |
909 | (forward-line -1)) | |
910 | (>= location (point))) | |
911 | ;; Consistency check: going down and up | |
912 | ;; shouldn't take us back before BEG. | |
913 | (> (point) beg)) | |
914 | (let (end middle) | |
915 | ;; Don't include any final whitespace | |
916 | ;; in the name we use. | |
917 | (skip-chars-backward " \t\n") | |
5960adc7 DL |
918 | (setq end (point)) |
919 | (backward-sexp 1) | |
6cbe2ec4 RS |
920 | ;; Now find the right beginning of the name. |
921 | ;; Include certain keywords if they | |
922 | ;; precede the name. | |
5960adc7 | 923 | (setq middle (point)) |
6cbe2ec4 RS |
924 | ;; Single (forward-sexp -1) invocation is |
925 | ;; not enough for C++ member function defined | |
926 | ;; as part of nested class and/or namespace | |
927 | ;; like: | |
928 | ;; | |
929 | ;; void | |
930 | ;; foo::bar::baz::bazz () | |
931 | ;; { ... | |
932 | ;; | |
933 | ;; Here we have to move the point to | |
934 | ;; the beginning of foo, not bazz. | |
935 | (while (not (looking-back "\\(^\\|[ \t]\\)")) | |
936 | (forward-sexp -1)) | |
937 | ;; Is this C++ method? | |
938 | (when (and (< 2 middle) | |
939 | (string= (buffer-substring (- middle 2) | |
940 | middle) | |
941 | "::")) | |
942 | ;; Include "classname::". | |
943 | (setq middle (point))) | |
944 | ;; Ignore these subparts of a class decl | |
945 | ;; and move back to the class name itself. | |
946 | (while (looking-at "public \\|private ") | |
947 | (skip-chars-backward " \t:") | |
948 | (setq end (point)) | |
949 | (backward-sexp 1) | |
950 | (setq middle (point)) | |
951 | (forward-word -1)) | |
952 | (and (bolp) | |
953 | (looking-at | |
954 | "enum \\|struct \\|union \\|class ") | |
955 | (setq middle (point))) | |
956 | (goto-char end) | |
957 | (when (eq (preceding-char) ?=) | |
958 | (forward-char -1) | |
959 | (skip-chars-backward " \t") | |
960 | (setq end (point))) | |
961 | (buffer-substring-no-properties | |
962 | middle end))))))))) | |
fb644f48 | 963 | ((memq major-mode add-log-tex-like-modes) |
2cc0b765 | 964 | (if (re-search-backward |
5960adc7 DL |
965 | "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" |
966 | nil t) | |
2cc0b765 RS |
967 | (progn |
968 | (goto-char (match-beginning 0)) | |
5960adc7 DL |
969 | (buffer-substring-no-properties |
970 | (1+ (point)) ; without initial backslash | |
971 | (line-end-position))))) | |
2cc0b765 | 972 | ((eq major-mode 'texinfo-mode) |
3071ee28 | 973 | (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t) |
5960adc7 | 974 | (match-string-no-properties 1))) |
c06e9d8b | 975 | ((memq major-mode '(perl-mode cperl-mode)) |
5a9ac14b | 976 | (if (re-search-backward "^sub[ \t]+\\([^({ \t\n]+\\)" nil t) |
5960adc7 DL |
977 | (match-string-no-properties 1))) |
978 | ;; Emacs's autoconf-mode installs its own | |
979 | ;; `add-log-current-defun-function'. This applies to | |
980 | ;; a different mode apparently for editing .m4 | |
981 | ;; autoconf source. | |
f654865f | 982 | ((eq major-mode 'autoconf-mode) |
5960adc7 DL |
983 | (if (re-search-backward |
984 | "^\\(\\(m4_\\)?define\\|A._DEFUN\\)(\\[?\\([A-Za-z0-9_]+\\)" nil t) | |
985 | (match-string-no-properties 3))) | |
2cc0b765 RS |
986 | (t |
987 | ;; If all else fails, try heuristics | |
c1356086 GM |
988 | (let (case-fold-search |
989 | result) | |
2cc0b765 | 990 | (end-of-line) |
c1356086 GM |
991 | (when (re-search-backward |
992 | add-log-current-defun-header-regexp | |
993 | (- (point) 10000) | |
994 | t) | |
5960adc7 DL |
995 | (setq result (or (match-string-no-properties 1) |
996 | (match-string-no-properties 0))) | |
c1356086 GM |
997 | ;; Strip whitespace away |
998 | (when (string-match "\\([^ \t\n\r\f].*[^ \t\n\r\f]\\)" | |
999 | result) | |
5960adc7 | 1000 | (setq result (match-string-no-properties 1 result))) |
c1356086 | 1001 | result)))))) |
2cc0b765 | 1002 | (error nil))) |
ef15f270 | 1003 | |
83afd62c | 1004 | (defvar change-log-get-method-definition-md) |
15319a8f | 1005 | |
83afd62c | 1006 | ;; Subroutine used within change-log-get-method-definition. |
59c1a7de RS |
1007 | ;; Add the last match in the buffer to the end of `md', |
1008 | ;; followed by the string END; move to the end of that match. | |
83afd62c KH |
1009 | (defun change-log-get-method-definition-1 (end) |
1010 | (setq change-log-get-method-definition-md | |
1011 | (concat change-log-get-method-definition-md | |
5960adc7 | 1012 | (match-string 1) |
15319a8f | 1013 | end)) |
59c1a7de RS |
1014 | (goto-char (match-end 0))) |
1015 | ||
83afd62c | 1016 | (defun change-log-get-method-definition () |
eba72fc1 | 1017 | "For Objective C, return the method name if we are in a method." |
83afd62c | 1018 | (let ((change-log-get-method-definition-md "[")) |
59c1a7de | 1019 | (save-excursion |
f27f16ed | 1020 | (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t) |
83afd62c | 1021 | (change-log-get-method-definition-1 " "))) |
59c1a7de RS |
1022 | (save-excursion |
1023 | (cond | |
f27f16ed | 1024 | ((re-search-forward "^\\([-+]\\)[ \t\n\f\r]*\\(([^)]*)\\)?\\s-*" nil t) |
83afd62c | 1025 | (change-log-get-method-definition-1 "") |
59c1a7de RS |
1026 | (while (not (looking-at "[{;]")) |
1027 | (looking-at | |
f27f16ed | 1028 | "\\([A-Za-z_]*:?\\)\\s-*\\(([^)]*)\\)?[A-Za-z_]*[ \t\n\f\r]*") |
83afd62c KH |
1029 | (change-log-get-method-definition-1 "")) |
1030 | (concat change-log-get-method-definition-md "]")))))) | |
075a6629 DL |
1031 | \f |
1032 | (defun change-log-sortable-date-at () | |
1033 | "Return date of log entry in a consistent form for sorting. | |
1034 | Point is assumed to be at the start of the entry." | |
1035 | (require 'timezone) | |
1036 | (if (looking-at "^\\sw.........[0-9:+ ]*") | |
1037 | (let ((date (match-string-no-properties 0))) | |
1038 | (if date | |
1039 | (if (string-match "\\(....\\)-\\(..\\)-\\(..\\)\\s-+" date) | |
1040 | (concat (match-string 1 date) (match-string 2 date) | |
1041 | (match-string 3 date)) | |
1042 | (condition-case nil | |
1043 | (timezone-make-date-sortable date) | |
1044 | (error nil))))) | |
1045 | (error "Bad date"))) | |
59c1a7de | 1046 | |
7cd017ba SM |
1047 | (defun change-log-resolve-conflict () |
1048 | "Function to be used in `smerge-resolve-function'." | |
1049 | (let ((buf (current-buffer))) | |
1050 | (with-temp-buffer | |
1051 | (insert-buffer-substring buf (match-beginning 1) (match-end 1)) | |
1052 | (save-match-data (change-log-mode)) | |
1053 | (let ((other-buf (current-buffer))) | |
1054 | (with-current-buffer buf | |
1055 | (save-excursion | |
1056 | (save-restriction | |
1057 | (narrow-to-region (match-beginning 0) (match-end 0)) | |
1058 | (replace-match (match-string 3) t t) | |
1059 | (change-log-merge other-buf)))))))) | |
1060 | ||
075a6629 DL |
1061 | ;;;###autoload |
1062 | (defun change-log-merge (other-log) | |
eba72fc1 | 1063 | "Merge the contents of change log file OTHER-LOG with this buffer. |
075a6629 | 1064 | Both must be found in Change Log mode (since the merging depends on |
7cd017ba SM |
1065 | the appropriate motion commands). OTHER-LOG can be either a file name |
1066 | or a buffer. | |
075a6629 | 1067 | |
918f4ac3 DL |
1068 | Entries are inserted in chronological order. Both the current and |
1069 | old-style time formats for entries are supported." | |
075a6629 DL |
1070 | (interactive "*fLog file name to merge: ") |
1071 | (if (not (eq major-mode 'change-log-mode)) | |
1072 | (error "Not in Change Log mode")) | |
7cd017ba SM |
1073 | (let ((other-buf (if (bufferp other-log) other-log |
1074 | (find-file-noselect other-log))) | |
075a6629 DL |
1075 | (buf (current-buffer)) |
1076 | date1 start end) | |
1077 | (save-excursion | |
1078 | (goto-char (point-min)) | |
1079 | (set-buffer other-buf) | |
1080 | (goto-char (point-min)) | |
1081 | (if (not (eq major-mode 'change-log-mode)) | |
1082 | (error "%s not found in Change Log mode" other-log)) | |
1083 | ;; Loop through all the entries in OTHER-LOG. | |
1084 | (while (not (eobp)) | |
1085 | (setq date1 (change-log-sortable-date-at)) | |
1086 | (setq start (point) | |
1087 | end (progn (forward-page) (point))) | |
1088 | ;; Look for an entry in original buffer that isn't later. | |
1089 | (with-current-buffer buf | |
1090 | (while (and (not (eobp)) | |
1091 | (string< date1 (change-log-sortable-date-at))) | |
1092 | (forward-page)) | |
1093 | (if (not (eobp)) | |
1094 | (insert-buffer-substring other-buf start end) | |
1095 | ;; At the end of the original buffer, insert a newline to | |
1096 | ;; separate entries and then the rest of the file being | |
7cd017ba SM |
1097 | ;; merged. |
1098 | (unless (or (bobp) | |
1099 | (and (= ?\n (char-before)) | |
1100 | (or (<= (1- (point)) (point-min)) | |
1101 | (= ?\n (char-before (1- (point))))))) | |
97f4e87c | 1102 | (insert (if use-hard-newlines hard-newline "\n"))) |
7cd017ba SM |
1103 | ;; Move to the end of it to terminate outer loop. |
1104 | (with-current-buffer other-buf | |
1105 | (goto-char (point-max))) | |
1106 | (insert-buffer-substring other-buf start))))))) | |
ef15f270 | 1107 | |
918f4ac3 DL |
1108 | ;;;###autoload |
1109 | (defun change-log-redate () | |
1110 | "Fix any old-style date entries in the current log file to default format." | |
1111 | (interactive) | |
1112 | (require 'timezone) | |
1113 | (save-excursion | |
1114 | (goto-char (point-min)) | |
1115 | (while (re-search-forward "^\\sw.........[0-9:+ ]*" nil t) | |
1116 | (unless (= 12 (- (match-end 0) (match-beginning 0))) | |
1117 | (let* ((date (save-match-data | |
1118 | (timezone-fix-time (match-string 0) nil nil))) | |
1119 | (zone (if (consp (aref date 6)) | |
1120 | (nth 1 (aref date 6))))) | |
1121 | (replace-match (format-time-string | |
1122 | "%Y-%m-%d " | |
1123 | (encode-time (aref date 5) | |
1124 | (aref date 4) | |
1125 | (aref date 3) | |
1126 | (aref date 2) | |
1127 | (aref date 1) | |
1128 | (aref date 0) | |
1129 | zone)))))))) | |
1130 | ||
1da56800 RS |
1131 | (provide 'add-log) |
1132 | ||
d1921057 | 1133 | ;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762 |
fd7fa35a | 1134 | ;;; add-log.el ends here |