Mercurial > emacs
comparison src/emacs.c @ 83653:2a69b973fae2
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--multi-tty--0--patch-32
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Aug 2007 04:55:30 +0000 |
parents | 5b644ae74c91 a550f33e0e04 |
children | 534b1b9b7dcd |
comparison
equal
deleted
inserted
replaced
83652:5b644ae74c91 | 83653:2a69b973fae2 |
---|---|
279 | 279 |
280 #define USAGE2 "\ | 280 #define USAGE2 "\ |
281 Action options:\n\ | 281 Action options:\n\ |
282 \n\ | 282 \n\ |
283 FILE visit FILE using find-file\n\ | 283 FILE visit FILE using find-file\n\ |
284 +LINE FILE visit FILE using find-file, then go to line LINE\n\ | 284 +LINE go to line LINE in next FILE\n\ |
285 +LINE:COLUMN FILE visit FILE using find-file, then go to line LINE,\n\ | 285 +LINE:COLUMN go to line LINE, column COLUMN, in next FILE\n\ |
286 column COLUMN\n\ | |
287 --directory, -L DIR add DIR to variable load-path\n\ | 286 --directory, -L DIR add DIR to variable load-path\n\ |
288 --eval EXPR evaluate Emacs Lisp expression EXPR\n\ | 287 --eval EXPR evaluate Emacs Lisp expression EXPR\n\ |
289 --execute EXPR evaluate Emacs Lisp expression EXPR\n\ | 288 --execute EXPR evaluate Emacs Lisp expression EXPR\n\ |
290 --file FILE visit FILE using find-file\n\ | 289 --file FILE visit FILE using find-file\n\ |
291 --find-file FILE visit FILE using find-file\n\ | 290 --find-file FILE visit FILE using find-file\n\ |