Mercurial > emacs
changeset 79555:52d2889ab3d8
(set-buffer-menubar): Remove unused
function.
(add-submenu): Only define for XEmacs.
(verilog-regexp-words): Revert previous change, keep the other
definition.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Tue, 11 Dec 2007 03:19:09 +0000 |
| parents | bc59ec18d036 |
| children | 239cccb702f6 |
| files | lisp/ChangeLog lisp/progmodes/verilog-mode.el |
| diffstat | 2 files changed, 20 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Dec 09 19:38:37 2007 +0000 +++ b/lisp/ChangeLog Tue Dec 11 03:19:09 2007 +0000 @@ -1,3 +1,11 @@ +2007-12-11 Dan Nicolaescu <dann@ics.uci.edu> + + * progmodes/verilog-mode.el (set-buffer-menubar): Remove unused + function. + (add-submenu): Only define for XEmacs. + (verilog-regexp-words): Revert previous change, keep the other + definition. + 2007-12-09 Dan Nicolaescu <dann@ics.uci.edu> * progmodes/perl-mode.el (perl-continued-statement-offset)
--- a/lisp/progmodes/verilog-mode.el Sun Dec 09 19:38:37 2007 +0000 +++ b/lisp/progmodes/verilog-mode.el Tue Dec 11 03:19:09 2007 +0000 @@ -154,14 +154,14 @@ nil ;; fab (defmacro store-match-data (&rest args) nil)) (error nil)) - (condition-case nil - (if (boundp 'current-menubar) - nil ;; great - (progn - (defmacro set-buffer-menubar (&rest args) nil) - (defmacro add-submenu (&rest args) nil)) - ) - (error nil)) + (if (featurep 'xemacs) + (condition-case nil + (if (boundp 'current-menubar) + nil ;; great + (progn + (defmacro add-submenu (&rest args) nil)) + ) + (error nil))) (condition-case nil (if (fboundp 'zmacs-activate-region) nil ;; great @@ -274,9 +274,10 @@ (concat open (mapconcat 'regexp-quote strings "\\|") close))) )) -(defun verilog-regexp-words (a) - "Call 'regexp-opt' with word delimiters for the words A." - (concat "\\<" (verilog-regexp-opt a t) "\\>")) +(eval-when-compile + (defun verilog-regexp-words (a) + "Call 'regexp-opt' with word delimiters for the words A." + (concat "\\<" (verilog-regexp-opt a t) "\\>"))) (defun verilog-customize () "Link to customize screen for Verilog."