aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris <[email protected]>2007-08-04 02:32:43 +0000
committerGlenn Morris <[email protected]>2007-08-04 02:32:43 +0000
commite9bfd3a3f9953520b99e4dac4cc0e59b6a9fc83c (patch)
tree3324dafb762697d5b44f0acf88fb3313e5e5d5a3
parentddbdaf2420a5f2eea54ee023da9c2064e4d2d551 (diff)
(cperl-compilation-error-regexp-alist): Remove duplicate defvar
preventing initialization. (cperl-mode): Fix compilation-error-regexp-alist-alist setting.
-rw-r--r--lisp/progmodes/cperl-mode.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index d1dc0e875c..3badfed5d4 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1497,9 +1497,16 @@ the last)."
(defvar cperl-use-major-mode 'cperl-mode)
(defvar cperl-font-lock-multiline-start nil)
(defvar cperl-font-lock-multiline nil)
-(defvar cperl-compilation-error-regexp-alist nil)
(defvar cperl-font-locking nil)
+;; NB as it stands the code in cperl-mode assumes this only has one
+;; element. If Xemacs 19 support were dropped, this could all be simplified.
+(defvar cperl-compilation-error-regexp-alist
+ ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS).
+ '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]"
+ 2 3))
+ "Alist that specifies how to match errors in perl output.")
+
;;;###autoload
(defun cperl-mode ()
"Major mode for editing Perl code.
@@ -1786,7 +1793,7 @@ or as help on variables `cperl-tips', `cperl-problems',
(cond ((boundp 'compilation-error-regexp-alist-alist);; xemacs 20.x
(make-local-variable 'compilation-error-regexp-alist-alist)
(set 'compilation-error-regexp-alist-alist
- (cons (cons 'cperl cperl-compilation-error-regexp-alist)
+ (cons (cons 'cperl (car cperl-compilation-error-regexp-alist))
(symbol-value 'compilation-error-regexp-alist-alist)))
(if (fboundp 'compilation-build-compilation-error-regexp-alist)
(let ((f 'compilation-build-compilation-error-regexp-alist))
@@ -5702,13 +5709,6 @@ indentation and initial hashes. Behaves usually outside of comment."
(t 5))) ; should not happen
-(defvar cperl-compilation-error-regexp-alist
- ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS).
- '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]"
- 2 3))
- "Alist that specifies how to match errors in perl output.")
-
-
(defun cperl-windowed-init ()
"Initialization under windowed version."
(cond ((featurep 'ps-print)