*** etags.el.dist	2017-06-24 18:03:59.000000000 -0400
--- etags.el	2019-10-18 19:50:39.334796361 -0400
***************
*** 777,790 ****
  
  ;;;###autoload
  (defun tags-lazy-completion-table ()
!   (let ((buf (current-buffer)))
      (lambda (string pred action)
        (with-current-buffer buf
          (save-excursion
            ;; If we need to ask for the tag table, allow that.
            (let ((enable-recursive-minibuffers t))
              (visit-tags-table-buffer))
!           (complete-with-action action (tags-completion-table) string pred))))))
  
  ;;;###autoload (defun tags-completion-at-point-function ()
  ;;;###autoload   (if (or tags-table-list tags-file-name)
--- 777,794 ----
  
  ;;;###autoload
  (defun tags-lazy-completion-table ()
!   (let ((buf (current-buffer))
!         (fold (if (memq tags-case-fold-search '(t nil))
! 				      tags-case-fold-search
! 				    case-fold-search)))
      (lambda (string pred action)
        (with-current-buffer buf
          (save-excursion
            ;; If we need to ask for the tag table, allow that.
            (let ((enable-recursive-minibuffers t))
              (visit-tags-table-buffer))
!           (let ((completion-ignore-case fold))
!             (complete-with-action action (tags-completion-table) string pred)))))))
  
  ;;;###autoload (defun tags-completion-at-point-function ()
  ;;;###autoload   (if (or tags-table-list tags-file-name)
***************
*** 796,805 ****
    "Using tags, return a completion table for the text around point.
  If no tags table is loaded, do nothing and return nil."
    (when (or tags-table-list tags-file-name)
!     (let ((completion-ignore-case (if (memq tags-case-fold-search '(t nil))
! 				      tags-case-fold-search
! 				    case-fold-search))
! 	  (pattern (find-tag--default))
  	  beg)
        (when pattern
  	(save-excursion
--- 800,806 ----
    "Using tags, return a completion table for the text around point.
  If no tags table is loaded, do nothing and return nil."
    (when (or tags-table-list tags-file-name)
!     (let ((pattern (find-tag--default))
  	  beg)
        (when pattern
  	(save-excursion
***************
*** 813,822 ****
  
  (defun find-tag-tag (string)
    "Read a tag name, with defaulting and completion."
!   (let* ((completion-ignore-case (if (memq tags-case-fold-search '(t nil))
! 				     tags-case-fold-search
! 				   case-fold-search))
! 	 (default (find-tag--default))
  	 (spec (completing-read (if default
  				    (format "%s (default %s): "
  					    (substring string 0 (string-match "[ :]+\\'" string))
--- 814,820 ----
  
  (defun find-tag-tag (string)
    "Read a tag name, with defaulting and completion."
!   (let* ((default (find-tag--default))
  	 (spec (completing-read (if default
  				    (format "%s (default %s): "
  					    (substring string 0 (string-match "[ :]+\\'" string))