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

[Stefan Monnier]

Index: emacs/lisp/progmodes/ebrowse.el
diff -c emacs/lisp/progmodes/ebrowse.el:1.17 
emacs/lisp/progmodes/ebrowse.el:1.18
*** emacs/lisp/progmodes/ebrowse.el:1.17        Mon Jun 10 05:04:23 2002
--- emacs/lisp/progmodes/ebrowse.el     Sat Jul 13 16:17:00 2002
***************
*** 1699,1706 ****
        with start = 0
        finally return regexp
        while (string-match "[ \t]+" regexp start)
!       do (setf (substring regexp (match-beginning 0) (match-end 0))
!                "[ \t]*"
                 start (+ (match-beginning 0) 5))))
  
  
--- 1699,1707 ----
        with start = 0
        finally return regexp
        while (string-match "[ \t]+" regexp start)
!       do (setq regexp (concat (substring regexp 0 (match-beginning 0))
!                               "[ \t]*"
!                               (substring regexp (match-end 0)))
                 start (+ (match-beginning 0) 5))))
  
  
***************
*** 3313,3322 ****
        (unless member-name
          (error "No member name at point"))
        (if members
!           (let* ((alist (ebrowse-hash-table-to-alist members))
!                  (name (ebrowse-ignoring-completion-case
!                          (completing-read prompt alist nil nil member-name)))
!                  (completion-result (try-completion name alist)))
              ;; Cannot rely on `try-completion' returning t for exact
              ;; matches!  It returns the name as a string.
              (unless (setq member-info (gethash name members))
--- 3314,3322 ----
        (unless member-name
          (error "No member name at point"))
        (if members
!           (let* ((name (ebrowse-ignoring-completion-case
!                          (completing-read prompt members nil nil 
member-name)))
!                  (completion-result (try-completion name members)))
              ;; Cannot rely on `try-completion' returning t for exact
              ;; matches!  It returns the name as a string.
              (unless (setq member-info (gethash name members))
***************
*** 3555,3562 ****
    (let* ((buffer (or (ebrowse-choose-from-browser-buffers)
                     (error "No tree buffer")))
         (files (save-excursion (set-buffer buffer) (ebrowse-files-table)))
!        (alist (ebrowse-hash-table-to-alist files))
!        (file (completing-read "List members in file: " alist nil t))
         (header (ebrowse-value-in-buffer 'ebrowse--header buffer))
         temp-buffer-setup-hook
         (members (ebrowse-member-table header)))
--- 3555,3561 ----
    (let* ((buffer (or (ebrowse-choose-from-browser-buffers)
                     (error "No tree buffer")))
         (files (save-excursion (set-buffer buffer) (ebrowse-files-table)))
!        (file (completing-read "List members in file: " files nil t))
         (header (ebrowse-value-in-buffer 'ebrowse--header buffer))
         temp-buffer-setup-hook
         (members (ebrowse-member-table header)))
***************
*** 3639,3653 ****
      (ebrowse-member-table header)))
  
  
- (defun ebrowse-hash-table-to-alist (table)
-   "Return an alist holding all key/value pairs of hash table TABLE."
-   (let ((list))
-     (maphash #'(lambda (key value)
-                (setq list (cons (cons key value) list)))
-            table)
-     list))
-   
- 
  (defun ebrowse-cyclic-successor-in-string-list (string list)
    "Return the item following STRING in LIST.
  If STRING is the last element, return the first element as successor."
--- 3638,3643 ----
***************
*** 3672,3680 ****
       ;; With prefix, read name from minibuffer with completion.
       (prefix
        (let* ((members (ebrowse-some-member-table))
-            (alist (ebrowse-hash-table-to-alist members))
             (completion (completing-read "Insert member: "
!                                         alist nil t pattern)))
        (when completion
          (setf ebrowse-last-completion-location nil)
          (delete-region begin end)
--- 3662,3669 ----
       ;; With prefix, read name from minibuffer with completion.
       (prefix
        (let* ((members (ebrowse-some-member-table))
             (completion (completing-read "Insert member: "
!                                         members nil t pattern)))
        (when completion
          (setf ebrowse-last-completion-location nil)
          (delete-region begin end)