(c-search-uplist-for-classkey): When `search-end' is a cons, use its car.

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5d4c265b9c0..1892ce94b87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-25  Sam Steingold  <sds@gnu.org>
+
+        * progmodes/cc-engine.el (c-search-uplist-for-classkey): When
+        `search-end' is a cons, use its car.
+
 2002-07-25  Dave Love  <fx@gnu.org>
 
         * obsolete/c-mode.el: Deleted.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 045556de180..3994c5cc22c 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1794,10 +1794,11 @@ brace."
               search-end (nth 0 paren-state)))
       ;; if search-end is nil, or if the search-end character isn't an
       ;; open brace, we are definitely not in a class
-      (if (or (not search-end)
-              (< search-end (point-min))
-              (not (eq (char-after search-end) ?{)))
-          nil
+      (when (consp search-end)
+        (setq search-end (car search-end)))
+      (unless (or (not search-end)
+                  (< search-end (point-min))
+                  (not (eq (char-after search-end) ?{)))
         ;; now, we need to look more closely at search-start.  if
         ;; search-start is nil, then our start boundary is really
         ;; point-min.