[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22_BASE] |
Date: |
Sat, 04 Aug 2007 02:32:43 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Glenn Morris <gm> 07/08/04 02:32:43
Index: cperl-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/cperl-mode.el,v
retrieving revision 1.89.2.1
retrieving revision 1.89.2.2
diff -u -b -r1.89.2.1 -r1.89.2.2
--- cperl-mode.el 25 Jul 2007 04:29:35 -0000 1.89.2.1
+++ cperl-mode.el 4 Aug 2007 02:32:43 -0000 1.89.2.2
@@ -1497,9 +1497,16 @@
(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 @@
(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 @@
(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)
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22_BASE],
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22_BASE], Glenn Morris, 2007/08/08
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22_BASE], Vinicius Jose Latorre, 2007/08/17
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22_BASE], Stefan Monnier, 2007/08/23
- [Emacs-diffs] Changes to emacs/lisp/progmodes/cperl-mode.el, v [EMACS_22_BASE], Dan Nicolaescu, 2007/08/25