aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-01-16 21:07:25 -0500
committerGlenn Morris2013-01-16 21:07:25 -0500
commit19503d5abfb9d9c1faa2e6e9e8636623c7667e54 (patch)
tree476ac3f69e501f0c5abe0363cd63e43c0ac6c2c5
parent085d34c46ae83282b6bd1002ee9fb9be62e76594 (diff)
downloademacs-19503d5abfb9d9c1faa2e6e9e8636623c7667e54.tar.gz
emacs-19503d5abfb9d9c1faa2e6e9e8636623c7667e54.zip
etags.el fix for bug#13412
* lisp/progmodes/etags.el (tags-table-check-computed-list): Preserve point in tags buffer.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/etags.el16
2 files changed, 15 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2d869ae827..cd7a013d55c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-01-17 Glenn Morris <rgm@gnu.org>
2
3 * progmodes/etags.el (tags-table-check-computed-list):
4 Preserve point in tags buffer. (Bug#13412)
5
12013-01-16 Glenn Morris <rgm@gnu.org> 62013-01-16 Glenn Morris <rgm@gnu.org>
2 7
3 * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. 8 * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index dc16a2ce762..21844d20598 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -335,12 +335,15 @@ file the tag was in."
335 (save-excursion 335 (save-excursion
336 (tags-verify-table (buffer-file-name table-buffer)))) 336 (tags-verify-table (buffer-file-name table-buffer))))
337 (with-current-buffer table-buffer 337 (with-current-buffer table-buffer
338 (if (tags-included-tables) 338 ;; Needed so long as etags-tags-included-tables
339 ;; Insert the included tables into the list we 339 ;; does not save-excursion.
340 ;; are processing. 340 (save-excursion
341 (setcdr tables (nconc (mapcar 'tags-expand-table-name 341 (if (tags-included-tables)
342 (tags-included-tables)) 342 ;; Insert the included tables into the list we
343 (cdr tables))))) 343 ;; are processing.
344 (setcdr tables (nconc (mapcar 'tags-expand-table-name
345 (tags-included-tables))
346 (cdr tables))))))
344 ;; This table is not in core yet. Insert a placeholder 347 ;; This table is not in core yet. Insert a placeholder
345 ;; saying we must read it into core to check for included 348 ;; saying we must read it into core to check for included
346 ;; tables before searching the next table in the list. 349 ;; tables before searching the next table in the list.
@@ -1547,6 +1550,7 @@ hits the start of file."
1547 files))) 1550 files)))
1548 (nreverse files))) 1551 (nreverse files)))
1549 1552
1553;; FIXME? Should this save-excursion?
1550(defun etags-tags-included-tables () ; Doc string? 1554(defun etags-tags-included-tables () ; Doc string?
1551 (let ((files nil) 1555 (let ((files nil)
1552 beg) 1556 beg)