Mercurial > emacs
comparison 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.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Fri, 19 Oct 2007 18:41:09 +0000 |
parents | 80960ac6e90e |
children | 4a8e2330b157 4b09bb044f38 |
comparison
equal
deleted
inserted
replaced
85450:a3bb0c15528c | 85451:e1af3a725ca4 |
---|---|
1128 ;; the beginning-of-line is ok except when positioned on a "file-name" tag. | 1128 ;; the beginning-of-line is ok except when positioned on a "file-name" tag. |
1129 (setq file (expand-file-name | 1129 (setq file (expand-file-name |
1130 (if (memq (car order) '(tag-exact-file-name-match-p | 1130 (if (memq (car order) '(tag-exact-file-name-match-p |
1131 tag-file-name-match-p | 1131 tag-file-name-match-p |
1132 tag-partial-file-name-match-p)) | 1132 tag-partial-file-name-match-p)) |
1133 (save-excursion (next-line 1) | 1133 (save-excursion (forward-line 1) |
1134 (file-of-tag)) | 1134 (file-of-tag)) |
1135 (file-of-tag))) | 1135 (file-of-tag))) |
1136 tag-info (funcall snarf-tag-function)) | 1136 tag-info (funcall snarf-tag-function)) |
1137 | 1137 |
1138 ;; Get the local value in the tags table buffer before switching buffers. | 1138 ;; Get the local value in the tags table buffer before switching buffers. |
1452 ;; buffer before switching buffers. | 1452 ;; buffer before switching buffers. |
1453 (goto-func goto-tag-location-function) | 1453 (goto-func goto-tag-location-function) |
1454 (tag-info (save-excursion (funcall snarf-tag-function))) | 1454 (tag-info (save-excursion (funcall snarf-tag-function))) |
1455 (tag (if (eq t (car tag-info)) nil (car tag-info))) | 1455 (tag (if (eq t (car tag-info)) nil (car tag-info))) |
1456 (file-path (save-excursion (if tag (file-of-tag) | 1456 (file-path (save-excursion (if tag (file-of-tag) |
1457 (save-excursion (next-line 1) | 1457 (save-excursion (forward-line 1) |
1458 (file-of-tag))))) | 1458 (file-of-tag))))) |
1459 (file-label (if tag (file-of-tag t) | 1459 (file-label (if tag (file-of-tag t) |
1460 (save-excursion (next-line 1) | 1460 (save-excursion (forward-line 1) |
1461 (file-of-tag t)))) | 1461 (file-of-tag t)))) |
1462 (pt (with-current-buffer standard-output (point)))) | 1462 (pt (with-current-buffer standard-output (point)))) |
1463 (if tag | 1463 (if tag |
1464 (progn | 1464 (progn |
1465 (princ (format "[%s]: " file-label)) | 1465 (princ (format "[%s]: " file-label)) |
1882 (while (visit-tags-table-buffer (not first-time)) | 1882 (while (visit-tags-table-buffer (not first-time)) |
1883 (setq first-time nil) | 1883 (setq first-time nil) |
1884 (funcall tags-apropos-function regexp)))) | 1884 (funcall tags-apropos-function regexp)))) |
1885 (etags-tags-apropos-additional regexp)) | 1885 (etags-tags-apropos-additional regexp)) |
1886 (with-current-buffer "*Tags List*" | 1886 (with-current-buffer "*Tags List*" |
1887 (require 'apropos) | 1887 (eval-and-compile (require 'apropos)) |
1888 (apropos-mode) | 1888 (apropos-mode) |
1889 ;; apropos-mode is derived from fundamental-mode and it kills | 1889 ;; apropos-mode is derived from fundamental-mode and it kills |
1890 ;; all local variables. | 1890 ;; all local variables. |
1891 (setq buffer-read-only t))) | 1891 (setq buffer-read-only t))) |
1892 | 1892 |