Mercurial > emacs
changeset 46688:07e19a2737a1
(c-search-uplist-for-classkey): When `search-end' is a cons, use its car.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Thu, 25 Jul 2002 13:23:27 +0000 |
| parents | d173e099056d |
| children | 90b567ad02ed |
| files | lisp/ChangeLog lisp/progmodes/cc-engine.el |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jul 25 11:15:07 2002 +0000 +++ b/lisp/ChangeLog Thu Jul 25 13:23:27 2002 +0000 @@ -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.
--- a/lisp/progmodes/cc-engine.el Thu Jul 25 11:15:07 2002 +0000 +++ b/lisp/progmodes/cc-engine.el Thu Jul 25 13:23:27 2002 +0000 @@ -1794,10 +1794,11 @@ 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.