X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a9faac5c6333bcbfb30a00debf3de7a44e430e49..d590048bed8466e84c66d60f35df236d0ff8e81b:/lisp/informat.el

diff --git a/lisp/informat.el b/lisp/informat.el
index a1028087c3..8a539f5c67 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -1,9 +1,8 @@
 ;;; informat.el --- info support functions package for Emacs
 
-;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 2001-2016 Free Software Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: help
 
 ;; This file is part of GNU Emacs.
@@ -32,6 +31,10 @@
 
 (declare-function texinfo-format-refill "texinfmt" ())
 
+;; From texinfmt.el
+(defvar texinfo-command-start)
+(defvar texinfo-command-end)
+
 ;;;###autoload
 (defun Info-tagify (&optional input-buffer-name)
   "Create or update Info file tag table in current buffer or in a region."
@@ -40,14 +43,17 @@
   ;; save-restrictions would not work
   ;; because it records the old max relative to the end.
   ;; We record it relative to the beginning.
-  (if input-buffer-name
-      (message "Tagifying region in %s ..." input-buffer-name)
-      (message
-       "Tagifying %s ..."  (file-name-nondirectory (buffer-file-name))))
   (let ((omin (point-min))
 	(omax (point-max))
 	(nomax (= (point-max) (1+ (buffer-size))))
-	(opoint (point)))
+	(opoint (point))
+	(msg (format "Tagifying %s..."
+		     (cond (input-buffer-name
+			    (format "region in %s" input-buffer-name))
+			   (buffer-file-name
+			    (file-name-nondirectory (buffer-file-name)))
+			   (t "buffer")))))
+    (message "%s" msg)
     (unwind-protect
     (progn
       (widen)
@@ -145,11 +151,8 @@
 		(insert "\^_\nEnd tag table\n")))))
       (goto-char opoint)
       (narrow-to-region omin (if nomax (1+ (buffer-size))
-			       (min omax (point-max))))))
-  (if input-buffer-name
-      (message "Tagifying region in %s done" input-buffer-name)
-      (message
-       "Tagifying %s done"  (file-name-nondirectory (buffer-file-name)))))
+			       (min omax (point-max)))))
+    (message "%sdone" msg)))
 
 
 ;;;###autoload