From 38f584e90e8785a409d99d90f41ff357f7680ee1 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Tue, 11 Dec 2007 03:19:09 +0000 Subject: [PATCH] (set-buffer-menubar): Remove unused function. (add-submenu): Only define for XEmacs. (verilog-regexp-words): Revert previous change, keep the other definition. --- lisp/ChangeLog | 8 ++++++++ lisp/progmodes/verilog-mode.el | 23 ++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 13505897067..b49ec6d23bd 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2007-12-11 Dan Nicolaescu + + * 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 * progmodes/perl-mode.el (perl-continued-statement-offset) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 79a4cd5c399..2d34d9d599a 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -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 @@ STRING should be given if the last search was by `string-match' on STRING." (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." -- 2.39.2