Mercurial > emacs
comparison src/emacs.c @ 91010:aaccdab0ee26
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 852-856)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-249
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 21 Aug 2007 04:54:03 +0000 |
| parents | 424b655804ca a550f33e0e04 |
| children | bdb3fe0ba9fa |
comparison
equal
deleted
inserted
replaced
| 91009:e7395a700642 | 91010:aaccdab0ee26 |
|---|---|
| 278 | 278 |
| 279 #define USAGE2 "\ | 279 #define USAGE2 "\ |
| 280 Action options:\n\ | 280 Action options:\n\ |
| 281 \n\ | 281 \n\ |
| 282 FILE visit FILE using find-file\n\ | 282 FILE visit FILE using find-file\n\ |
| 283 +LINE FILE visit FILE using find-file, then go to line LINE\n\ | 283 +LINE go to line LINE in next FILE\n\ |
| 284 +LINE:COLUMN FILE visit FILE using find-file, then go to line LINE,\n\ | 284 +LINE:COLUMN go to line LINE, column COLUMN, in next FILE\n\ |
| 285 column COLUMN\n\ | |
| 286 --directory, -L DIR add DIR to variable load-path\n\ | 285 --directory, -L DIR add DIR to variable load-path\n\ |
| 287 --eval EXPR evaluate Emacs Lisp expression EXPR\n\ | 286 --eval EXPR evaluate Emacs Lisp expression EXPR\n\ |
| 288 --execute EXPR evaluate Emacs Lisp expression EXPR\n\ | 287 --execute EXPR evaluate Emacs Lisp expression EXPR\n\ |
| 289 --file FILE visit FILE using find-file\n\ | 288 --file FILE visit FILE using find-file\n\ |
| 290 --find-file FILE visit FILE using find-file\n\ | 289 --find-file FILE visit FILE using find-file\n\ |