Re: @cindex adds vertical space where none is desired

[Karl Berry]

    Subject: @cindex adds vertical space where none is desired

FWIW, I hope I've just checked in the real change for this.
Hope your presentation went well :).

Thanks,
Karl


diff -p -u -1 -r1.282 -r1.284
--- texinfo.tex 18 Nov 2008 05:53:29 -0000      1.282
+++ texinfo.tex 26 Nov 2008 00:41:00 -0000      1.284
@@ -1606,3 +1606,5 @@ output) for that.)}
 \else
-  \let\pdfmkdest = \gobble
+  % non-pdf mode
+  % \unskip in hmode, since that's what \safewhatsit does.
+  \def\pdfmkdest{\ifhmode\unskip\fi\gobble}
   \let\pdfurl = \gobble
@@ -4339,2 +4341,9 @@ end
 \ifhmode
+  % The \unskip is in case we are preceded by glue; we don't want to
+  % allow a line break just before us.  For example, if a paragraph
+  % happens to end perfectly justified and the next line is
+  % @cindex foo
+  % (with no blank line preceding), our whatsit would end up on a line
+  % by itself, appearing as a spurious blank line in the output.
+  \unskip
   #1%