diff options
| author | Miles Bader <[email protected]> | 2007-08-21 04:55:30 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2007-08-21 04:55:30 +0000 |
| commit | 1fb072d1dff954c21d4805196df62c8eeead301c (patch) | |
| tree | da374db1a51e2a355b46f26a1c99e1ac5db5dca4 /src/emacs.c | |
| parent | aaf34461ff5804e5cebe163b31e535da72e81d87 (diff) | |
| parent | bdaf8a62d53cf8d5a0dc4f0dc530ecd6fc1f44fe (diff) | |
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: [email protected]/emacs--multi-tty--0--patch-32
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index e23f8083a3..55475e5779 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -281,9 +281,8 @@ Initialization options:\n\ Action options:\n\ \n\ FILE visit FILE using find-file\n\ -+LINE FILE visit FILE using find-file, then go to line LINE\n\ -+LINE:COLUMN FILE visit FILE using find-file, then go to line LINE,\n\ - column COLUMN\n\ ++LINE go to line LINE in next FILE\n\ ++LINE:COLUMN go to line LINE, column COLUMN, in next FILE\n\ --directory, -L DIR add DIR to variable load-path\n\ --eval EXPR evaluate Emacs Lisp expression EXPR\n\ --execute EXPR evaluate Emacs Lisp expression EXPR\n\ |