diff options
| author | Miles Bader | 2007-08-13 13:51:08 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:51:08 +0000 |
| commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
| tree | b096310b459b78e437f08ac0f1f00954840a5db5 /lib-src | |
| parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/etags.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c index f4322e8c0f8..0412137496f 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -2883,7 +2883,7 @@ static void make_C_tag __P((bool)); | |||
| 2883 | * function or variable, or corresponds to a typedef, or | 2883 | * function or variable, or corresponds to a typedef, or |
| 2884 | * is a struct/union/enum tag, or #define, or an enum constant. | 2884 | * is a struct/union/enum tag, or #define, or an enum constant. |
| 2885 | * | 2885 | * |
| 2886 | * *IS_FUNC gets TRUE iff the token is a function or #define macro | 2886 | * *IS_FUNC gets TRUE if the token is a function or #define macro |
| 2887 | * with args. C_EXTP points to which language we are looking at. | 2887 | * with args. C_EXTP points to which language we are looking at. |
| 2888 | * | 2888 | * |
| 2889 | * Globals | 2889 | * Globals |
| @@ -4803,7 +4803,7 @@ Pascal_functions (inf) | |||
| 4803 | int save_lineno, namelen, taglen; | 4803 | int save_lineno, namelen, taglen; |
| 4804 | char c, *name; | 4804 | char c, *name; |
| 4805 | 4805 | ||
| 4806 | bool /* each of these flags is TRUE iff: */ | 4806 | bool /* each of these flags is TRUE if: */ |
| 4807 | incomment, /* point is inside a comment */ | 4807 | incomment, /* point is inside a comment */ |
| 4808 | inquote, /* point is inside '..' string */ | 4808 | inquote, /* point is inside '..' string */ |
| 4809 | get_tagname, /* point is after PROCEDURE/FUNCTION | 4809 | get_tagname, /* point is after PROCEDURE/FUNCTION |