2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 483e6976aba..6fb830ecbb5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-11-10  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * textmodes/texinfo.el (texinfo-block-default): New var.
+        (texinfo-insert-block): Use it.  Insert a newline if needed.
+
         * textmodes/fill.el (fill-indent-according-to-mode): New var.
         (fill-region-as-paragraph): Use it.
 
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 1a8eec0cbd3..d578362f517 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -624,10 +624,16 @@ value of `texinfo-mode-hook'."
   "Regexp for environment-like TexInfo list commands.
    Subexpression 1 is what goes into the corresponding `@end' statement.")
 
+(defvar texinfo-block-default "example")
+
 (define-skeleton texinfo-insert-block
   "Create a matching pair @<cmd> .. @end <cmd> at point.
 Puts point on a blank line between them."
-  (completing-read "Block name: " (mapcar 'list texinfo-environments))
+  (setq texinfo-block-default
+        (completing-read (format "Block name [%s]: " texinfo-block-default)
+                         (mapcar 'list texinfo-environments)
+                         nil nil nil nil texinfo-block-default))
+  (unless (save-excursion (beginning-of-line) (looking-at "[ \t]*$")) '\n)
   "@" str \n _ \n "@end " str \n)
 
 (defun texinfo-inside-macro-p (macro &optional bound)