Revert last change for now.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f9a3a8bc8c33e836a7e47dd14abe1a0a159f7a6d..f72f097f0470240f135feb1da12a26b498362c59 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,11 +4,6 @@
        Add SRFI 11 support.
        (let-values, let*-values): Specify scheme-indent-function.
 
-2008-02-22  Andreas Schwab  <schwab@suse.de>
-
-       * progmodes/verilog-mode.el (verilog-xemacs-menu): Fix setup of
-       "Move" submenu.
-
 2008-02-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * vc.el (vc-exec-after): Move setting mode-line-process in the

diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 73f0c0194f984a8178058aacc6cded981dc7b2e9..0351dd3f297122bda7bdea49668f67f69f5a5eb1 100644 (file)
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -992,13 +992,14 @@ If set will become buffer local.")
       :selected (equal verilog-tool `verilog-compiler)]
      )
     ("Move"
-     ,@(if (featurep 'xemacs)
-          '(["Beginning of function"           verilog-beg-of-defun t]
-            ["End of function"                 verilog-end-of-defun t]
-            ["Mark function"                   verilog-mark-defun t])
-       '(["Beginning of function"              beginning-of-defun t]
-         ["End of function"                    end-of-defun t]
-         ["Mark function"                      mark-defun t]))
+     ,(if (featurep 'xemacs)
+         (progn
+           ["Beginning of function"            verilog-beg-of-defun t]
+           ["End of function"                  verilog-end-of-defun t]
+           ["Mark function"                    verilog-mark-defun t])
+       ["Beginning of function"                beginning-of-defun t]
+       ["End of function"                      end-of-defun t]
+       ["Mark function"                        mark-defun t])
 
      ["Goto function/module"           verilog-goto-defun t]
      ["Move to beginning of block"     electric-verilog-backward-sexp t]