(xmenu_show): Don't look in menubar for core.height if no menu bar.

[bpt/emacs.git] / lisp / vc.el

diff --git a/lisp/vc.el b/lisp/vc.el
index 7e7e641..1ad1c9a 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1,6 +1,6 @@
 ;;; vc.el --- drive a version-control system from within Emacs
 
-;; Copyright (C) 1992, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: eggert@twinsun.com
@@ -1651,7 +1651,7 @@ Return nil if there is no such person."
         (status (apply 'vc-do-command 2 command file options)))
     ;; Some RCS versions don't understand "--brief"; work around this.
     (if (eq status 2)
-       (apply 'vc-do-command 1 command file (if cmp options (cdr options)))
+       (apply 'vc-do-command 1 command file (if cmp (cdr options) options))
       status)))
 
 (defun vc-check-headers ()