aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Roberts2004-02-08 15:30:42 +0000
committerNick Roberts2004-02-08 15:30:42 +0000
commita0c3f8bc4625be893b42446672622e7bd1278fc7 (patch)
tree2c93bf8cc2a2c91cfa3e01718e118d080d1c0430
parentc35391d102b2d83bc7a8a84aa6b61bf3351067a2 (diff)
downloademacs-a0c3f8bc4625be893b42446672622e7bd1278fc7.tar.gz
emacs-a0c3f8bc4625be893b42446672622e7bd1278fc7.zip
(gud-jdb-marker-filter): Add period as optional thousands separator; fixes
<class>:<line-number> regexp for non-english locales.
-rw-r--r--lisp/progmodes/gud.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index f63998270dc..de68d012470 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -1967,14 +1967,14 @@ nil)
1967 ;; FIXME: Java ID's are UNICODE strings, this matches ASCII 1967 ;; FIXME: Java ID's are UNICODE strings, this matches ASCII
1968 ;; ID's only. 1968 ;; ID's only.
1969 ;; 1969 ;;
1970 ;; The "," in the last square-bracket is necessary because of 1970 ;; The ".," in the last square-bracket are necessary because
1971 ;; Sun's total disrespect for backwards compatibility in 1971 ;; of Sun's total disrespect for backwards compatibility in
1972 ;; reported line numbers from jdb - starting in 1.4.0 they 1972 ;; reported line numbers from jdb - starting in 1.4.0 they
1973 ;; introduced a comma at the thousands position (how 1973 ;; print line numbers using LOCALE, inserting a comma or a
1974 ;; ingenious!) 1974 ;; period at the thousands positions (how ingenious!).
1975 1975
1976 "\\(\[[0-9]+\] \\)*\\([a-zA-Z0-9.$_]+\\)\\.[a-zA-Z0-9$_<>(),]+ \ 1976 "\\(\[[0-9]+\] \\)*\\([a-zA-Z0-9.$_]+\\)\\.[a-zA-Z0-9$_<>(),]+ \
1977\\(([a-zA-Z0-9.$_]+:\\|line=\\)\\([0-9,]+\\)" 1977\\(([a-zA-Z0-9.$_]+:\\|line=\\)\\([0-9.,]+\\)"
1978 gud-marker-acc) 1978 gud-marker-acc)
1979 1979
1980 ;; A good marker is one that: 1980 ;; A good marker is one that:
@@ -2001,7 +2001,7 @@ nil)
2001 (string-to-int 2001 (string-to-int
2002 (let 2002 (let
2003 ((numstr (match-string 4 gud-marker-acc))) 2003 ((numstr (match-string 4 gud-marker-acc)))
2004 (if (string-match "," numstr) 2004 (if (string-match "[.,]" numstr)
2005 (replace-match "" nil nil numstr) 2005 (replace-match "" nil nil numstr)
2006 numstr))))) 2006 numstr)))))
2007 (message "Could not find source file."))) 2007 (message "Could not find source file.")))