diff lisp/progmodes/etags.el @ 85451:e1af3a725ca4

* textmodes/two-column.el (2C-split, 2C-merge): * textmodes/bib-mode.el (bib-find-key, mark-bib): * progmodes/idlw-shell.el (idlwave-shell-move-or-history): * progmodes/etags.el (find-tag-in-order, etags-tags-apropos) * progmodes/ada-xref.el (ada-get-all-references): * obsolete/mlsupport.el (ml-next-line, ml-previous-line): * emulation/vi.el (vi-previous-line-first-nonwhite) (vi-effective-range, vi-put-before): * emulation/edt.el (edt-next-line, edt-previous-line) (edt-paragraph-forward): Use forward-line. * progmodes/etags.el (tags-apropos): Require apropos at compile time too. * progmodes/prolog.el: Require comint when compiling. (inferior-prolog-flavor): Move defvar before use.

--- a/lisp/progmodes/etags.el	Fri Oct 19 17:27:58 2007 +0000
+++ b/lisp/progmodes/etags.el	Fri Oct 19 18:41:09 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.