[Emacs-diffs] Changes to emacs/lisp/progmodes/etags.el

[Masatake YAMATO]

Index: emacs/lisp/progmodes/etags.el
diff -c emacs/lisp/progmodes/etags.el:1.174 emacs/lisp/progmodes/etags.el:1.175
*** emacs/lisp/progmodes/etags.el:1.174 Sat Apr  5 13:19:30 2003
--- emacs/lisp/progmodes/etags.el       Fri Apr 11 05:08:29 2003
***************
*** 1890,1895 ****
--- 1890,1899 ----
  
  ;; XXX Kludge interface.
  
+ (define-button-type 'tags-select-tags-table
+   'action (lambda (button) (select-tags-table-select))
+   'help-echo "RET, t or mouse-2: select tags table")
+ 
  ;; XXX If a file is in multiple tables, selection may get the wrong one.
  ;;;###autoload
  (defun select-tags-table ()
***************
*** 1901,1916 ****
    (setq buffer-read-only nil)
    (erase-buffer)
    (let ((set-list tags-table-set-list)
!       (desired-point nil))
      (when tags-table-list
          (setq desired-point (point-marker))
          (princ tags-table-list (current-buffer))
          (insert "\C-m")
          (prin1 (car tags-table-list) (current-buffer)) ;invisible
        (insert "\n"))
      (while set-list
        (unless (eq (car set-list) tags-table-list)
        (princ (car set-list) (current-buffer))
        (insert "\C-m")
        (prin1 (car (car set-list)) (current-buffer)) ;invisible
        (insert "\n"))
--- 1905,1925 ----
    (setq buffer-read-only nil)
    (erase-buffer)
    (let ((set-list tags-table-set-list)
!       (desired-point nil)
!       b)
      (when tags-table-list
          (setq desired-point (point-marker))
+         (setq b (point))
          (princ tags-table-list (current-buffer))
+         (make-text-button b (point) 'type 'tags-select-tags-table)
          (insert "\C-m")
          (prin1 (car tags-table-list) (current-buffer)) ;invisible
        (insert "\n"))
      (while set-list
        (unless (eq (car set-list) tags-table-list)
+       (setq b (point))
        (princ (car set-list) (current-buffer))
+       (make-text-button b (point) 'type 'tags-select-tags-table)
        (insert "\C-m")
        (prin1 (car (car set-list)) (current-buffer)) ;invisible
        (insert "\n"))
***************
*** 1918,1924 ****
      (when tags-file-name
          (or desired-point
              (setq desired-point (point-marker)))
!         (insert tags-file-name "\C-m")
          (prin1 tags-file-name (current-buffer)) ;invisible
        (insert "\n"))
      (setq set-list (delete tags-file-name
--- 1927,1936 ----
      (when tags-file-name
          (or desired-point
              (setq desired-point (point-marker)))
!         (setq b (point))
!         (insert tags-file-name)
!         (make-text-button b (point) 'type 'tags-select-tags-table)
!         (insert "\C-m")
          (prin1 tags-file-name (current-buffer)) ;invisible
        (insert "\n"))
      (setq set-list (delete tags-file-name
***************
*** 1926,1932 ****
                                               (mapcar 'copy-sequence
                                                       tags-table-set-list)))))
      (while set-list
!       (insert (car set-list) "\C-m")
        (prin1 (car set-list) (current-buffer)) ;invisible
        (insert "\n")
        (setq set-list (delete (car set-list) set-list)))
--- 1938,1947 ----
                                               (mapcar 'copy-sequence
                                                       tags-table-set-list)))))
      (while set-list
!       (setq b (point))
!       (insert (car set-list))
!       (make-text-button b (point) 'type 'tags-select-tags-table)
!       (insert "\C-m")
        (prin1 (car set-list) (current-buffer)) ;invisible
        (insert "\n")
        (setq set-list (delete (car set-list) set-list)))
***************
*** 1939,1953 ****
    (set-buffer-modified-p nil)
    (select-tags-table-mode))
  
! (defvar select-tags-table-mode-map)
! (let ((map (make-sparse-keymap)))
!   (define-key map "t" 'select-tags-table-select)
!   (define-key map " " 'next-line)
!   (define-key map "\^?" 'previous-line)
!   (define-key map "n" 'next-line)
!   (define-key map "p" 'previous-line)
!   (define-key map "q" 'select-tags-table-quit)
!   (setq select-tags-table-mode-map map))
  
  (defun select-tags-table-mode ()
    "Major mode for choosing a current tags table among those already loaded.
--- 1954,1968 ----
    (set-buffer-modified-p nil)
    (select-tags-table-mode))
  
! (defvar select-tags-table-mode-map
!   (let ((map (copy-keymap button-buffer-map)))
!     (define-key map "t" 'push-button)
!     (define-key map " " 'next-line)
!     (define-key map "\^?" 'previous-line)
!     (define-key map "n" 'next-line)
!     (define-key map "p" 'previous-line)
!     (define-key map "q" 'select-tags-table-quit)
!     map))
  
  (defun select-tags-table-mode ()
    "Major mode for choosing a current tags table among those already loaded.