[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111187: etags.el fix for bug#13412

[Glenn Morris]

------------------------------------------------------------
revno: 111187
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2013-01-16 21:07:25 -0500
message:
  etags.el fix for bug#13412
  
  * lisp/progmodes/etags.el (tags-table-check-computed-list):
  Preserve point in tags buffer.
modified:
  lisp/ChangeLog
  lisp/progmodes/etags.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-16 02:03:06 +0000
+++ b/lisp/ChangeLog    2013-01-17 02:07:25 +0000
@@ -1,3 +1,8 @@
+2013-01-17  Glenn Morris  <address@hidden>
+
+       * progmodes/etags.el (tags-table-check-computed-list):
+       Preserve point in tags buffer.  (Bug#13412)
+
 2013-01-16  Glenn Morris  <address@hidden>
 
        * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.

=== modified file 'lisp/progmodes/etags.el'
--- a/lisp/progmodes/etags.el   2013-01-03 02:54:10 +0000
+++ b/lisp/progmodes/etags.el   2013-01-17 02:07:25 +0000
@@ -335,12 +335,15 @@
                     (save-excursion
                       (tags-verify-table (buffer-file-name table-buffer))))
                (with-current-buffer table-buffer
-                 (if (tags-included-tables)
-                     ;; Insert the included tables into the list we
-                     ;; are processing.
-                     (setcdr tables (nconc (mapcar 'tags-expand-table-name
-                                                   (tags-included-tables))
-                                           (cdr tables)))))
+                  ;; Needed so long as etags-tags-included-tables
+                  ;; does not save-excursion.
+                  (save-excursion
+                    (if (tags-included-tables)
+                        ;; Insert the included tables into the list we
+                        ;; are processing.
+                        (setcdr tables (nconc (mapcar 'tags-expand-table-name
+                                                      (tags-included-tables))
+                                              (cdr tables))))))
              ;; This table is not in core yet.  Insert a placeholder
              ;; saying we must read it into core to check for included
              ;; tables before searching the next table in the list.
@@ -1547,6 +1550,7 @@
                 files)))
     (nreverse files)))
 
+;; FIXME?  Should this save-excursion?
 (defun etags-tags-included-tables () ; Doc string?
   (let ((files nil)
        beg)