aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2009-07-19 00:47:47 +0000
committerGlenn Morris2009-07-19 00:47:47 +0000
commitd9e8a01896a4306b5d6e65d5f3008a4cc152712e (patch)
treefe464feec5f45b8028d8b6864703173e820762ef
parentda332cfbc589dc7944dd2981149aa1aa72b68b10 (diff)
downloademacs-d9e8a01896a4306b5d6e65d5f3008a4cc152712e.tar.gz
emacs-d9e8a01896a4306b5d6e65d5f3008a4cc152712e.zip
(verilog-error-regexp-add-xemacs): Silence compiler by only defining on XEmacs.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/verilog-mode.el47
2 files changed, 27 insertions, 23 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c74d22f737..04a93dfe596 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12009-07-19 Glenn Morris <rgm@gnu.org> 12009-07-19 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/verilog-mode.el (verilog-error-regexp-add-xemacs):
4 Silence compiler by only defining on XEmacs.
5
3 * international/mule.el (auto-coding-regexp-alist): Only match 6 * international/mule.el (auto-coding-regexp-alist): Only match
4 BABYL... at the start of buffer, not of lines. (Bug#3790) 7 BABYL... at the start of buffer, not of lines. (Bug#3790)
5 8
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 1a885fe6b73..c4b2f4a009e 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -1454,31 +1454,32 @@ without the directory portion, will be substituted."
1454 "\\b__FILE__\\b" (file-name-nondirectory (buffer-file-name)) 1454 "\\b__FILE__\\b" (file-name-nondirectory (buffer-file-name))
1455 t t compile-command)))) 1455 t t compile-command))))
1456 1456
1457;; Following code only gets called from compilation-mode-hook on XEmacs to add error handling. 1457(if (featurep 'xemacs)
1458(defun verilog-error-regexp-add-xemacs () 1458 ;; Following code only gets called from compilation-mode-hook on XEmacs to add error handling.
1459 "Teach XEmacs about verilog errors. 1459 (defun verilog-error-regexp-add-xemacs ()
1460 "Teach XEmacs about verilog errors.
1460Called by `compilation-mode-hook'. This allows \\[next-error] to 1461Called by `compilation-mode-hook'. This allows \\[next-error] to
1461find the errors." 1462find the errors."
1462 (interactive) 1463 (interactive)
1463 (if (boundp 'compilation-error-regexp-systems-alist) 1464 (if (boundp 'compilation-error-regexp-systems-alist)
1464 (if (and 1465 (if (and
1465 (not (equal compilation-error-regexp-systems-list 'all)) 1466 (not (equal compilation-error-regexp-systems-list 'all))
1466 (not (member compilation-error-regexp-systems-list 'verilog))) 1467 (not (member compilation-error-regexp-systems-list 'verilog)))
1467 (push 'verilog compilation-error-regexp-systems-list))) 1468 (push 'verilog compilation-error-regexp-systems-list)))
1468 (if (boundp 'compilation-error-regexp-alist-alist) 1469 (if (boundp 'compilation-error-regexp-alist-alist)
1469 (if (not (assoc 'verilog compilation-error-regexp-alist-alist)) 1470 (if (not (assoc 'verilog compilation-error-regexp-alist-alist))
1470 (setcdr compilation-error-regexp-alist-alist 1471 (setcdr compilation-error-regexp-alist-alist
1471 (cons verilog-error-regexp-xemacs-alist 1472 (cons verilog-error-regexp-xemacs-alist
1472 (cdr compilation-error-regexp-alist-alist))))) 1473 (cdr compilation-error-regexp-alist-alist)))))
1473 (if (boundp 'compilation-font-lock-keywords) 1474 (if (boundp 'compilation-font-lock-keywords)
1474 (progn 1475 (progn
1475 (make-variable-buffer-local 'compilation-font-lock-keywords) 1476 (make-variable-buffer-local 'compilation-font-lock-keywords)
1476 (setq compilation-font-lock-keywords verilog-error-font-lock-keywords) 1477 (setq compilation-font-lock-keywords verilog-error-font-lock-keywords)
1477 (font-lock-set-defaults))) 1478 (font-lock-set-defaults)))
1478 ;; Need to re-run compilation-error-regexp builder 1479 ;; Need to re-run compilation-error-regexp builder
1479 (if (fboundp 'compilation-build-compilation-error-regexp-alist) 1480 (if (fboundp 'compilation-build-compilation-error-regexp-alist)
1480 (compilation-build-compilation-error-regexp-alist)) 1481 (compilation-build-compilation-error-regexp-alist))
1481 ) 1482 ))
1482 1483
1483;; Following code only gets called from compilation-mode-hook on Emacs to add error handling. 1484;; Following code only gets called from compilation-mode-hook on Emacs to add error handling.
1484(defun verilog-error-regexp-add-emacs () 1485(defun verilog-error-regexp-add-emacs ()