diff lisp/progmodes/etags.el @ 91058:4b09bb044f38

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 899-900) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 129-130) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 259-260) - Merge from emacs--rel--22 - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-272

--- a/lisp/progmodes/etags.el	Fri Oct 19 00:03:33 2007 +0000
+++ b/lisp/progmodes/etags.el	Sat Oct 20 02:22:59 2007 +0000
@@ -1130,7 +1130,7 @@
 		  (if (memq (car order) '(tag-exact-file-name-match-p
 					  tag-file-name-match-p
 					  tag-partial-file-name-match-p))
-                      (save-excursion (next-line 1)
+                      (save-excursion (forward-line 1)
                                       (file-of-tag))
                     (file-of-tag)))
 	    tag-info (funcall snarf-tag-function))
@@ -1454,10 +1454,10 @@
 	     (tag-info (save-excursion (funcall snarf-tag-function)))
 	     (tag (if (eq t (car tag-info)) nil (car tag-info)))
 	     (file-path (save-excursion (if tag (file-of-tag)
-					  (save-excursion (next-line 1)
+					  (save-excursion (forward-line 1)
 							  (file-of-tag)))))
 	     (file-label (if tag (file-of-tag t)
-			   (save-excursion (next-line 1)
+			   (save-excursion (forward-line 1)
 					   (file-of-tag t))))
 	     (pt (with-current-buffer standard-output (point))))
 	(if tag
@@ -1884,7 +1884,7 @@
 	  (funcall tags-apropos-function regexp))))
     (etags-tags-apropos-additional regexp))
   (with-current-buffer "*Tags List*"
-    (require 'apropos)
+    (eval-and-compile (require 'apropos))
     (apropos-mode)
     ;; apropos-mode is derived from fundamental-mode and it kills
     ;; all local variables.