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