(etags-tags-completion-table): Let the line number or char pos be empty. (etags-snarf-tag): Look for line number as well as char pos. Let either be empty; return both. (etags-goto-tag-location): Arg also contains line number. If char pos is nil, use line number.