annotate lisp/packages/add-log.el @ 58:8b0bdfdf0cf0 r19-16-pre4

Import from CVS: tag r19-16-pre4
author cvs
date Mon, 13 Aug 2007 08:58:37 +0200
parents 56c54cf7c5b6
children 131b0175ea99
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 ;;; add-log.el --- change log maintenance commands for Emacs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
3 ;; Copyright (C) 1985, 86, 88, 93, 94, 1997 Free Software Foundation, Inc.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 ;; Keywords: maint
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 ;; This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 ;; XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 ;; under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ;; XEmacs is distributed in the hope that it will be useful, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;; General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
16
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
20 ;; along with XEmacs; see the file COPYING. If not, write to the
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
0293115a14e9 Import from CVS: tag r19-15b91
cvs
parents: 2
diff changeset
22 ;; Boston, MA 02111-1307, USA.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
24 ;;; Synched up with: Emacs 20.0.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 ;;; Commentary:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 ;; This facility is documented in the Emacs Manual.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 ;;; Code:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 (defvar change-log-default-name nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 "*Name of a change log file for \\[add-change-log-entry].")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 (defvar add-log-current-defun-function nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 "\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 *If non-nil, function to guess name of current function from surrounding text.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 \\[add-change-log-entry] calls this function (if nil, `add-log-current-defun'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 instead) with no arguments. It returns a string or nil if it cannot guess.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 (defvar add-log-full-name nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 "*Full name of user, for inclusion in ChangeLog daily headers.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 This defaults to the value returned by the `user-full-name' function.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 ;; So that the dump-time value doesn't go into loaddefs.el with the autoload.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 (or add-log-full-name (setq add-log-full-name (user-full-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 (defvar add-log-mailing-address nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 "*Electronic mail address of user, for inclusion in ChangeLog daily headers.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 This defaults to the value of `user-mail-address'.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
56 ;; XEmacs:
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 ;; So that the dump-time value doesn't go into loaddefs.el with the autoload.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 (or add-log-mailing-address
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 (setq add-log-mailing-address user-mail-address))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
61
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 (defvar change-log-font-lock-keywords
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
63 '(;;
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
64 ;; Date lines, new and old styles.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
65 ("^\\sw.........[0-9: ]*"
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
66 (0 font-lock-string-face)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
67 ("\\([^<]+\\)<\\([A-Za-z0-9_.-]+@[A-Za-z0-9_.-]+\\)>" nil nil
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
68 (1 font-lock-reference-face)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
69 (2 font-lock-variable-name-face)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
70 ;;
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
71 ;; File names.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
72 ("^\t\\* \\([^ ,:([\n]+\\)"
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
73 (1 font-lock-function-name-face)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
74 ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 font-lock-function-name-face)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
75 ;;
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
76 ;; Function or variable names.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
77 ("(\\([^ ,:\n]+\\)"
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
78 (1 font-lock-keyword-face)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
79 ("\\=, \\([^ ,:\n]+\\)" nil nil (1 font-lock-keyword-face)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
80 ;;
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
81 ;; Conditionals.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
82 ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 font-lock-variable-name-face))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
83 ;;
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
84 ;; Acknowledgments.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
85 ("^\t\\(From\\|Reported by\\)" 1 font-lock-comment-face)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
86 )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 "Additional expressions to highlight in Change Log mode.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 (put 'change-log-mode 'font-lock-defaults
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 '(change-log-font-lock-keywords t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 (defvar change-log-mode-map nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 "Keymap for Change Log major mode.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 (if change-log-mode-map
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 nil
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
95 (setq change-log-mode-map (make-sparse-keymap)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
96
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
97 (defvar change-log-time-zone-rule nil
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
98 "Time zone used for calculating change log time stamps.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
99 It takes the same format as the TZ argument of `set-time-zone-rule'.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
100 If nil, use local time.")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
101
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
102 (defun iso8601-time-zone (time)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
103 (let* ((utc-offset (or (car (current-time-zone time)) 0))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
104 (sign (if (< utc-offset 0) ?- ?+))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
105 (sec (abs utc-offset))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
106 (ss (% sec 60))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
107 (min (/ sec 60))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
108 (mm (% min 60))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
109 (hh (/ min 60)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
110 (format (cond ((not (zerop ss)) "%c%02d:%02d:%02d")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
111 ((not (zerop mm)) "%c%02d:%02d")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
112 (t "%c%02d"))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
113 sign hh mm ss)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
114
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
115 (defun change-log-name ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
116 (or change-log-default-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
117 (if (eq system-type 'vax-vms)
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
118 "$CHANGE_LOG$.TXT"
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
119 "ChangeLog")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
120
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
121 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
122 (defun prompt-for-change-log-name ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
123 "Prompt for a change log name."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
124 (let* ((default (change-log-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
125 (name (expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
126 (read-file-name (format "Log file (default %s): " default)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
127 nil default))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
128 ;; Handle something that is syntactically a directory name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
129 ;; Look for ChangeLog or whatever in that directory.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
130 (if (string= (file-name-nondirectory name) "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
131 (expand-file-name (file-name-nondirectory default)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132 name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
133 ;; Handle specifying a file that is a directory.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
134 (if (file-directory-p name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
135 (expand-file-name (file-name-nondirectory default)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
136 (file-name-as-directory name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
137 name))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
138
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
139 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
140 (defun find-change-log (&optional file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
141 "Find a change log file for \\[add-change-log-entry] and return the name.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
142
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
143 Optional arg FILE-NAME specifies the file to use.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
144 If FILE-NAME is nil, use the value of `change-log-default-name'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
145 If 'change-log-default-name' is nil, behave as though it were 'ChangeLog'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
146 \(or whatever we use on this operating system).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
148 If 'change-log-default-name' contains a leading directory component, then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
149 simply find it in the current directory. Otherwise, search in the current
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
150 directory and its successive parents for a file so named.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
151
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
152 Once a file is found, `change-log-default-name' is set locally in the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
153 current buffer to the complete file name."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154 ;; If user specified a file name or if this buffer knows which one to use,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
155 ;; just use that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
156 (or file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
157 (setq file-name (and change-log-default-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
158 (file-name-directory change-log-default-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
159 change-log-default-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
160 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
161 ;; Chase links in the source file
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 ;; and use the change log in the dir where it points.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 (setq file-name (or (and buffer-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
164 (file-name-directory
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
165 (file-chase-links buffer-file-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
166 default-directory))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
167 (if (file-directory-p file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168 (setq file-name (expand-file-name (change-log-name) file-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
169 ;; Chase links before visiting the file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
170 ;; This makes it easier to use a single change log file
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
171 ;; for several related directories.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
172 (setq file-name (file-chase-links file-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
173 (setq file-name (expand-file-name file-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
174 ;; Move up in the dir hierarchy till we find a change log file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
175 (let ((file1 file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
176 parent-dir)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
177 (while (and (not (or (get-file-buffer file1) (file-exists-p file1)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
178 (progn (setq parent-dir
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
179 (file-name-directory
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
180 (directory-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
181 (file-name-directory file1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
182 ;; Give up if we are already at the root dir.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183 (not (string= (file-name-directory file1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184 parent-dir))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 ;; Move up to the parent dir and try again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 (setq file1 (expand-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 (file-name-nondirectory (change-log-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 parent-dir)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 ;; If we found a change log in a parent, use that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 (if (or (get-file-buffer file1) (file-exists-p file1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191 (setq file-name file1)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 ;; Make a local variable in this buffer so we needn't search again.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 (set (make-local-variable 'change-log-default-name) file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 (defun add-change-log-entry (&optional whoami file-name other-window new-entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 "Find change log file and add an entry for today.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199 Optional arg (interactive prefix) non-nil means prompt for user name and site.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 Second arg is file name of change log. If nil, uses `change-log-default-name'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 Third arg OTHER-WINDOW non-nil means visit in other window.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202 Fourth arg NEW-ENTRY non-nil means always create a new entry at the front;
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
203 never append to an existing entry. Today's date is calculated according to
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
204 `change-log-time-zone-rule' if non-nil, otherwise in local time."
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
205 (interactive (list current-prefix-arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
206 (prompt-for-change-log-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
207 (or add-log-full-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
208 (setq add-log-full-name (user-full-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
209 (or add-log-mailing-address
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
210 (setq add-log-mailing-address user-mail-address))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 (if whoami
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 (setq add-log-full-name (read-string "Full name: " add-log-full-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 ;; Note that some sites have room and phone number fields in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
215 ;; full name which look silly when inserted. Rather than do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
216 ;; anything about that here, let user give prefix argument so that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
217 ;; s/he can edit the full name field in prompter if s/he wants.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
218 (setq add-log-mailing-address
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 (read-string "Mailing address: " add-log-mailing-address))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
220 (let ((defun (funcall (or add-log-current-defun-function
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
221 'add-log-current-defun)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
222 paragraph-end entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
223
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
224 (setq file-name (expand-file-name (find-change-log file-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
225
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
226 ;; Set ENTRY to the file name to use in the new entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
227 (and buffer-file-name
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
228 ;; Never want to add a change log entry for the ChangeLog file itself.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
229 (not (string= buffer-file-name file-name))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 (setq entry (if (string-match
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
231 (concat "^" (regexp-quote (file-name-directory
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
232 file-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
233 buffer-file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
234 (substring buffer-file-name (match-end 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
235 (file-name-nondirectory buffer-file-name))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
236
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
237 (if (and other-window (not (equal file-name buffer-file-name)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
238 (find-file-other-window file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
239 (find-file file-name))
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
240 (or (eq major-mode 'change-log-mode)
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
241 (change-log-mode))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
242 (undo-boundary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
243 (goto-char (point-min))
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
244 (let ((new-entry (concat (if change-log-time-zone-rule
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
245 (let ((tz (getenv "TZ"))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
246 (now (current-time)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
247 (unwind-protect
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
248 (progn
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
249 (set-time-zone-rule
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
250 change-log-time-zone-rule)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
251 (concat
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
252 (format-time-string "%Y-%m-%d " now)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
253 (iso8601-time-zone now)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
254 (set-time-zone-rule tz)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
255 (format-time-string "%Y-%m-%d"))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
256 " " add-log-full-name
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
257 " <" add-log-mailing-address ">")))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
258 (if (looking-at (regexp-quote new-entry))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
259 (forward-line 1)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
260 (insert new-entry "\n\n")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
261
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 ;; Search only within the first paragraph.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
263 (if (looking-at "\n*[^\n* \t]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
264 (skip-chars-forward "\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
265 (forward-paragraph 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
266 (setq paragraph-end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
267 (goto-char (point-min))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
268
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
269 ;; Now insert the new line for this entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
270 (cond ((re-search-forward "^\\s *\\*\\s *$" paragraph-end t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
271 ;; Put this file name into the existing empty entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 (if entry
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
273 (insert entry)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
274 ((and (not new-entry)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
275 (let (case-fold-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
276 (re-search-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
277 (concat (regexp-quote (concat "* " entry))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
278 ;; Don't accept `foo.bar' when
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
279 ;; looking for `foo':
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
280 "\\(\\s \\|[(),:]\\)")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
281 paragraph-end t)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
282 ;; Add to the existing entry for the same file.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
283 (re-search-forward "^\\s *$\\|^\\s \\*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
284 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
285 ;; Delete excess empty lines; make just 2.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
286 (while (and (not (eobp)) (looking-at "^\\s *$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
287 (delete-region (point) (save-excursion (forward-line 1) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
288 (insert "\n\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
289 (forward-line -2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
290 (indent-relative-maybe))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
291 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
292 ;; Make a new entry.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
293 (forward-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294 (while (looking-at "\\sW")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 (while (and (not (eobp)) (looking-at "^\\s *$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297 (delete-region (point) (save-excursion (forward-line 1) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
298 (insert "\n\n\n")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
299 (forward-line -2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
300 (indent-to left-margin)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
301 (insert "* " (or entry ""))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
302 ;; Now insert the function name, if we have one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
303 ;; Point is at the entry for this file,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
304 ;; either at the end of the line or at the first blank line.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
305 (if defun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
306 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
307 ;; Make it easy to get rid of the function name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
308 (undo-boundary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
309 (insert (if (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
310 (beginning-of-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
311 (looking-at "\\s *$"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312 ""
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
313 " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
314 "(" defun "): "))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
315 ;; No function name, so put in a colon unless we have just a star.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 (if (not (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317 (beginning-of-line 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
318 (looking-at "\\s *\\(\\*\\s *\\)?$")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
319 (insert ": ")))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
320
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
321 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
322 (defun add-change-log-entry-other-window (&optional whoami file-name)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
323 "Find change log file in other window and add an entry for today.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
324 Optional arg (interactive prefix) non-nil means prompt for user name and site.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325 Second arg is file name of change log. \
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
326 If nil, uses `change-log-default-name'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
327 (interactive (if current-prefix-arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
328 (list current-prefix-arg
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
329 (prompt-for-change-log-name))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330 (add-change-log-entry whoami file-name t))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
331 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
332
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
333 ;;;###autoload
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
334 (defun change-log-mode ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
335 "Major mode for editing change logs; like Indented Text Mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
336 Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
337 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window].
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
338 Each entry behaves as a paragraph, and the entries for one day as a page.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
339 Runs `change-log-mode-hook'."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
340 (interactive)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
341 (kill-all-local-variables)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
342 (indented-text-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
343 (setq major-mode 'change-log-mode
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344 mode-name "Change Log"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
345 left-margin 8
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
346 fill-column 74
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
347 indent-tabs-mode t
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
348 tab-width 8)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
349 (use-local-map change-log-mode-map)
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
350 (set (make-local-variable 'fill-paragraph-function)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
351 'change-log-fill-paragraph)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
352 ;; Let each entry behave as one paragraph:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
353 ;; We really do want "^" in paragraph-start below: it is only the lines that
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
354 ;; begin at column 0 (despite the left-margin of 8) that we are looking for.
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
355 (set (make-local-variable 'paragraph-start) "\\s *$\\|\f\\|^\\<")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
356 (set (make-local-variable 'paragraph-separate) "\\s *$\\|\f\\|^\\<")
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
357 ;; Let all entries for one day behave as one page.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
358 ;; Match null string on the date-line so that the date-line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
359 ;; is grouped with what follows.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
360 (set (make-local-variable 'page-delimiter) "^\\<\\|^\f")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
361 (set (make-local-variable 'version-control) 'never)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
362 (set (make-local-variable 'adaptive-fill-regexp) "\\s *")
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
363 ;;(set (make-local-variable 'font-lock-defaults)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
364 ;;'(change-log-font-lock-keywords t))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365 (run-hooks 'change-log-mode-hook))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
366
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
367 ;; It might be nice to have a general feature to replace this. The idea I
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
368 ;; have is a variable giving a regexp matching text which should not be
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
369 ;; moved from bol by filling. change-log-mode would set this to "^\\s *\\s(".
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
370 ;; But I don't feel up to implementing that today.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
371 (defun change-log-fill-paragraph (&optional justify)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
372 "Fill the paragraph, but preserve open parentheses at beginning of lines.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373 Prefix arg means justify as well."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
374 (interactive "P")
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
375 (let ((end (progn (forward-paragraph) (point)))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
376 (beg (progn (backward-paragraph) (point)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377 (paragraph-start (concat paragraph-start "\\|\\s *\\s(")))
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
378 (fill-region beg end justify)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
379 t))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381 (defvar add-log-current-defun-header-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 "^\\([A-Z][A-Z_ ]*[A-Z_]\\|[-_a-zA-Z]+\\)[ \t]*[:=]"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 "*Heuristic regexp used by `add-log-current-defun' for unknown major modes.")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 ;;;###autoload
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
386 (defvar add-log-lisp-like-modes
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
387 '(emacs-lisp-mode lisp-mode scheme-mode lisp-interaction-mode)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
388 "*Modes that look like Lisp to `add-log-current-defun'.")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
389
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
390 ;;;###autoload
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
391 (defvar add-log-c-like-modes
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
392 '(c-mode c++-mode c++-c-mode objc-mode)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
393 "*Modes that look like C to `add-log-current-defun'.")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
394
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
395 ;;;###autoload
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
396 (defvar add-log-tex-like-modes
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
397 '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
398 "*Modes that look like TeX to `add-log-current-defun'.")
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
399
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
400 ;;;###autoload
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 (defun add-log-current-defun ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 "Return name of function definition point is in, or nil.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 Texinfo (@node titles), Perl, and Fortran.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 Other modes are handled by a heuristic that looks in the 10K before
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 point for uppercase headings starting in the first column or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 identifiers followed by `:' or `=', see variable
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 `add-log-current-defun-header-regexp'.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 Has a preference of looking backwards."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 (let ((location (point)))
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
416 (cond ((memq major-mode add-log-lisp-like-modes)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 ;; If we are now precisely at the beginning of a defun,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 ;; make sure beginning-of-defun finds that one
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 ;; rather than the previous one.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 (or (eobp) (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 (beginning-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422 ;; Make sure we are really inside the defun found, not after it.
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
423 (if (and (looking-at "\\s(")
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
424 (progn (end-of-defun)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 (< location (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 (progn (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 (>= location (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 (if (looking-at "\\s(")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 (skip-chars-forward " '")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 (buffer-substring (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434 (progn (forward-sexp 1) (point))))))
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
435 ((and (memq major-mode add-log-c-like-modes)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
436 (save-excursion
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
437 (beginning-of-line)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
438 ;; Use eq instead of = here to avoid
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
439 ;; error when at bob and char-after
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
440 ;; returns nil.
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
441 (while (eq (char-after (- (point) 2)) ?\\)
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
442 (forward-line -1))
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
443 (looking-at "[ \t]*#[ \t]*define[ \t]")))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 ;; Handle a C macro definition.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 (while (eq (char-after (- (point) 2)) ?\\) ;not =; note above
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 (search-forward "define")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 (skip-chars-forward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 (buffer-substring (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (progn (forward-sexp 1) (point))))
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
452 ((memq major-mode add-log-c-like-modes)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 ;; See if we are in the beginning part of a function,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 ;; before the open brace. If so, advance forward.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (while (not (looking-at "{\\|\\(\\s *$\\)"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 (forward-line 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 (or (eobp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 (forward-char 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 (beginning-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 (if (progn (end-of-defun)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 (< location (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 (let (beg tem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 ;; Skip back over typedefs of arglist.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (while (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (looking-at "[ \t\n]"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 ;; See if this is using the DEFUN macro used in Emacs,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 ;; or the DEFUN macro used by the C library.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 (if (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 (and (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 (while (= (preceding-char) ?\\)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478 (end-of-line 2))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 (beginning-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 (setq tem (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 (looking-at "DEFUN\\b"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 (>= location tem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 (goto-char tem)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 (down-list 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 (if (= (char-after (point)) ?\")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 (forward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 (skip-chars-forward " ,")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492 (buffer-substring (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 (progn (forward-sexp 1) (point))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 (if (looking-at "^[+-]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (get-method-definition)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 ;; Ordinary C function syntax.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 (setq beg (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 (if (and (condition-case nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 ;; Protect against "Unbalanced parens" error.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 (down-list 1) ; into arglist
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502 (backward-up-list 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 (skip-chars-backward " \t")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 (error nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 ;; Verify initial pos was after
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 ;; real start of function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 (goto-char beg)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 ;; For this purpose, include the line
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 ;; that has the decl keywords. This
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 ;; may also include some of the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 ;; comments before the function.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (while (and (not (bobp))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (forward-line -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 (looking-at "[^\n\f]")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518 (forward-line -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 (>= location (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 ;; Consistency check: going down and up
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 ;; shouldn't take us back before BEG.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 (> (point) beg))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 (let (end middle)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 ;; Don't include any final newline
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 ;; in the name we use.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 (if (= (preceding-char) ?\n)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 (forward-char -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 (setq end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 ;; Now find the right beginning of the name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 ;; Include certain keywords if they
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 ;; precede the name.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 (setq middle (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (forward-word -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 ;; Ignore these subparts of a class decl
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 ;; and move back to the class name itself.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 (while (looking-at "public \\|private ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (skip-chars-backward " \t:")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (setq end (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (backward-sexp 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541 (setq middle (point))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (forward-word -1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 (and (bolp)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (looking-at "struct \\|union \\|class ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 (setq middle (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 (buffer-substring middle end)))))))))
48
56c54cf7c5b6 Import from CVS: tag r19-16b90
cvs
parents: 16
diff changeset
547 ((memq major-mode add-log-tex-like-modes)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (if (re-search-backward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 (goto-char (match-beginning 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 (buffer-substring (1+ (point));; without initial backslash
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (point))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 ((eq major-mode 'texinfo-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 (if (re-search-backward "^@node[ \t]+\\([^,\n]+\\)" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (buffer-substring (match-beginning 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 (match-end 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 ((eq major-mode 'perl-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (if (re-search-backward "^sub[ \t]+\\([^ \t\n]+\\)" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 (buffer-substring (match-beginning 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563 (match-end 1))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 ((eq major-mode 'fortran-mode)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 ;; must be inside function body for this to work
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 (beginning-of-fortran-subprogram)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 (let ((case-fold-search t)) ; case-insensitive
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 ;; search for fortran subprogram start
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 (if (re-search-forward
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570 "^[ \t]*\\(program\\|subroutine\\|function\
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 \\|[ \ta-z0-9*]*[ \t]+function\\)"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572 nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 ;; move to EOL or before first left paren
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (if (re-search-forward "[(\n]" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 (progn (forward-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 (skip-chars-backward " \t"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (end-of-line))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 ;; Use the name preceding that.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (buffer-substring (point)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 (progn (forward-sexp -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 (point)))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 (t
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 ;; If all else fails, try heuristics
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 (let (case-fold-search)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 (end-of-line)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 (if (re-search-backward add-log-current-defun-header-regexp
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588 (- (point) 10000)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 (buffer-substring (match-beginning 1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 (match-end 1))))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 (error nil)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 (defvar get-method-definition-md)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 ;; Subroutine used within get-method-definition.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 ;; Add the last match in the buffer to the end of `md',
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 ;; followed by the string END; move to the end of that match.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 (defun get-method-definition-1 (end)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 (setq get-method-definition-md
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 (concat get-method-definition-md
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 (buffer-substring (match-beginning 1) (match-end 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 end))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 (goto-char (match-end 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 ;; For objective C, return the method name if we are in a method.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (defun get-method-definition ()
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (let ((get-method-definition-md "["))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 (get-method-definition-1 " ")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 (save-excursion
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 (cond
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 ((re-search-forward "^\\([-+]\\)[ \t\n\f\r]*\\(([^)]*)\\)?\\s-*" nil t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 (get-method-definition-1 "")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 (while (not (looking-at "[{;]"))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 (looking-at
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 "\\([A-Za-z_]*:?\\)\\s-*\\(([^)]*)\\)?[A-Za-z_]*[ \t\n\f\r]*")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 (get-method-definition-1 ""))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 (concat get-method-definition-md "]"))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 (provide 'add-log)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 ;;; add-log.el ends here