From: Magnus H. <leg...@us...> - 2011-12-18 22:39:05
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "emacs-jabber". The branch, master has been updated via a034d4b330d23643169880e96e34e0cf61b76a11 (commit) from dc9fc0fa06ff8a18b5599572671ce598374aa83c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a034d4b330d23643169880e96e34e0cf61b76a11 Author: Jeremy Compostella <je...@Ap...> Date: Thu Dec 15 22:31:34 2011 +0100 jabber-core: Fix header parsing The (1+ (match-end 0)) is a mistake. Indeed, after the replace-match call the (match-end 0) point has changed to be at the end of the replaced string. So calling (point) is more than enough. Signed-off-by: Magnus Henoch <leg...@us...> diff --git a/AUTHORS b/AUTHORS index 4f60098..8e5c201 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,6 +7,7 @@ Evgenii Terechkov Contributors: Anthony Chaumas-Pellet +Jérémy Compostella Mathias Dahl Mario Domenech Goulart Nolan Eakins diff --git a/jabber-core.el b/jabber-core.el index 21d0d96..8b558a8 100644 --- a/jabber-core.el +++ b/jabber-core.el @@ -858,8 +858,7 @@ DATA is any sexp." ;; Let's pretend that the stream header is a closed tag, ;; and parse it as such. (replace-match "/>" t t nil 1) - (let* (;; Thus we need to add one to the index... - (ending-at (1+ (match-end 0))) + (let* ((ending-at (point)) (stream-header (car (xml-parse-region (point-min) ending-at))) (session-id (jabber-xml-get-attribute stream-header 'id)) (stream-version (jabber-xml-get-attribute stream-header 'version))) ----------------------------------------------------------------------- Summary of changes: AUTHORS | 1 + jabber-core.el | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- emacs-jabber |