From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Jan Nieuwenhuizen Newsgroups: gmane.emacs.devel Subject: jdb line fix for gud Date: Mon, 26 Jan 2004 12:16:33 +0100 Organization: Jan at Appel Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1075115999 19360 80.91.224.253 (26 Jan 2004 11:19:59 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 26 Jan 2004 11:19:59 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Jan 26 12:19:50 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1Al4mU-0001i4-00 for ; Mon, 26 Jan 2004 12:19:50 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1Al4mT-0002vq-00 for ; Mon, 26 Jan 2004 12:19:49 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.24) id 1Al4kV-00049d-9O for emacs-devel@quimby.gnus.org; Mon, 26 Jan 2004 06:17:47 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24) id 1Al4kK-00047B-Og for emacs-devel@gnu.org; Mon, 26 Jan 2004 06:17:36 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24) id 1Al4jm-0003sa-G7 for emacs-devel@gnu.org; Mon, 26 Jan 2004 06:17:33 -0500 Original-Received: from [62.195.48.83] (helo=appel.flower) by monty-python.gnu.org with esmtp (Exim 4.24) id 1Al4jl-0003rS-HQ for emacs-devel@gnu.org; Mon, 26 Jan 2004 06:17:01 -0500 Original-Received: from localhost ([127.0.0.1] helo=appel.flower) by appel.flower with esmtp (Exim 3.36 #1 (Debian)) id 1Al4jK-00005E-00; Mon, 26 Jan 2004 12:16:34 +0100 Original-To: emacs-devel@gnu.org User-Agent: Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux) X-RBL-Warning: (inputs.orbz.org) X-RBL-Warning: (outputs.orbz.org) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:19481 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:19481 Hi, Find a small fix for jdb below. Is this acceptable, or should `[.,]' be replaced by the actual LOCALE's thousands separator (how?). Jan. Index: ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v retrieving revision 1.5622 diff -p -u -r1.5622 ChangeLog --- ChangeLog 25 Jan 2004 23:59:57 -0000 1.5622 +++ ChangeLog 26 Jan 2004 11:02:59 -0000 @@ -1,3 +1,9 @@ +2004-01-26 Jan Nieuwenhuizen + + * progmodes/gud.el (gud-jdb-marker-filter): Add period as optional + thousands separator; fixes : regexp for + non-english locales. + 2004-01-25 Glenn Morris * progmodes/fortran.el (fortran-break-before-delimiters): Doc fix. Index: progmodes/gud.el =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/progmodes/gud.el,v retrieving revision 1.15 diff -p -u -r1.15 gud.el --- progmodes/gud.el 7 Jan 2004 23:22:34 -0000 1.15 +++ progmodes/gud.el 26 Jan 2004 11:02:59 -0000 @@ -1967,14 +1967,14 @@ nil) ;; FIXME: Java ID's are UNICODE strings, this matches ASCII ;; ID's only. ;; - ;; The "," in the last square-bracket is necessary because of - ;; Sun's total disrespect for backwards compatibility in + ;; The ".," in the last square-bracket are necessary because + ;; of Sun's total disrespect for backwards compatibility in ;; reported line numbers from jdb - starting in 1.4.0 they - ;; introduced a comma at the thousands position (how - ;; ingenious!) + ;; print line numbers using LOCALE, inserting a comma or a + ;; period at the thousands positions (how ingenious!). "\\(\[[0-9]+\] \\)*\\([a-zA-Z0-9.$_]+\\)\\.[a-zA-Z0-9$_<>(),]+ \ -\\(([a-zA-Z0-9.$_]+:\\|line=\\)\\([0-9,]+\\)" +\\(([a-zA-Z0-9.$_]+:\\|line=\\)\\([0-9.,]+\\)" gud-marker-acc) ;; A good marker is one that: @@ -2001,7 +2001,7 @@ nil) (string-to-int (let ((numstr (match-string 4 gud-marker-acc))) - (if (string-match "," numstr) + (if (string-match "[.,]" numstr) (replace-match "" nil nil numstr) numstr))))) (message "Could not find source file."))) -- Jan Nieuwenhuizen | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien | http://www.lilypond.org