aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaroly Lorentey2005-02-20 20:15:41 +0000
committerKaroly Lorentey2005-02-20 20:15:41 +0000
commit4e15f072da4b9d715b1c935a1d464553d7d52c2f (patch)
tree4a9241634b61bcf020fd60d0117594373db96e8f
parentb5d78df397f8cdcd20f3bcfbed2eb71d522abddd (diff)
downloademacs-4e15f072da4b9d715b1c935a1d464553d7d52c2f.tar.gz
emacs-4e15f072da4b9d715b1c935a1d464553d7d52c2f.zip
Fix line/column number positioning in emacsclient. (Reported by Han Boetes.)
* lisp/server.el (server-process-filter): When processing -position command, don't change the request string until the parameters are extracted. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-297
-rw-r--r--lisp/server.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/server.el b/lisp/server.el
index d8bd83b839f..f0ce3c670e0 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -677,9 +677,9 @@ The following commands are accepted by the client:
677 677
678 ;; -position LINE:COLUMN: Set point to the given position in the next file. 678 ;; -position LINE:COLUMN: Set point to the given position in the next file.
679 ((and (equal "-position" arg) (string-match "\\+\\([0-9]+\\):\\([0-9]+\\) " request)) 679 ((and (equal "-position" arg) (string-match "\\+\\([0-9]+\\):\\([0-9]+\\) " request))
680 (setq request (substring request (match-end 0)) 680 (setq lineno (string-to-int (match-string 1 request))
681 lineno (string-to-int (match-string 1 request)) 681 columnno (string-to-int (match-string 2 request))
682 columnno (string-to-int (match-string 2 request)))) 682 request (substring request (match-end 0))))
683 683
684 ;; -file FILENAME: Load the given file. 684 ;; -file FILENAME: Load the given file.
685 ((and (equal "-file" arg) (string-match "\\([^ ]+\\) " request)) 685 ((and (equal "-file" arg) (string-match "\\([^ ]+\\) " request))