Mercurial > emacs
diff lisp/server.el @ 83307:21eea50897a7
Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-313
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-314
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-315
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-316
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-317
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-318
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-319
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-69
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-347
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 20 May 2005 17:44:36 +0000 |
| parents | 6deb860255f3 a7e02ef1e3d6 |
| children | 6c13700d1c13 |
line wrap: on
line diff
--- a/lisp/server.el Mon May 16 15:49:27 2005 +0000 +++ b/lisp/server.el Fri May 20 17:44:36 2005 +0000 @@ -672,12 +672,12 @@ ;; -position LINE: Go to the given line in the next file. ((and (equal "-position" arg) (string-match "\\(\\+[0-9]+\\) " request)) (setq request (substring request (match-end 0)) - lineno (string-to-int (substring (match-string 1 request) 1)))) + lineno (string-to-number (substring (match-string 1 request) 1)))) ;; -position LINE:COLUMN: Set point to the given position in the next file. ((and (equal "-position" arg) (string-match "\\+\\([0-9]+\\):\\([0-9]+\\) " request)) - (setq lineno (string-to-int (match-string 1 request)) - columnno (string-to-int (match-string 2 request)) + (setq lineno (string-to-number (match-string 1 request)) + columnno (string-to-number (match-string 2 request)) request (substring request (match-end 0)))) ;; -file FILENAME: Load the given file.