comparison lisp/ido.el @ 109945:c5974968dea9

Fix buffer-list rename&refresh after after killing a buffer in ido. * lisp/ido.el: Revert ���scar's. (ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh. Remember the buffers at head, rather than their name. * lisp/iswitchb.el (iswitchb-kill-buffer): Re-make the list.

109944:48114bfd2ed3

(defvar ido-default-item)

;; Stores the current list of items that will be searched through.
;; The list is ordered, so that the most interesting item comes first,
;; although by default, the files visible in the current frame are put
;; at the end of the list.
(defvar ido-cur-list nil)

;; Stores the choice list for ido-completing-read
(defvar ido-choice-list nil)

;; Stores the list of items which are ignored when building
;; `ido-cur-list'.  It is in no specific order.
(defvar ido-ignored-list)

  (let* ((ido-current-buffers (ido-get-buffers-in-frames 'current))
	 (ido-temp-list (ido-make-buffer-list-1 (selected-frame) ido-current-buffers)))
    (if ido-temp-list
	(nconc ido-temp-list ido-current-buffers)
      (setq ido-temp-list ido-current-buffers))
    (if (and default (buffer-live-p (get-buffer default)))
	(progn
	  (setq ido-temp-list
		(delete default ido-temp-list))
	  (setq ido-temp-list
		(cons default ido-temp-list))))
    (run-hooks 'ido-make-buffer-list-hook)
    ido-temp-list))

(defun ido-make-choice-list (default)
  ;; Return the current list of choices.

(defun ido-get-bufname (win)
  ;; Used by `ido-get-buffers-in-frames' to walk through all windows
  (let ((buf (buffer-name (window-buffer win))))
	(unless (or (member buf ido-bufs-in-frame)
		    (minibufferp buf)
		    (member buf ido-ignore-item-temp-list))
	  ;; Only add buf if it is not already in list.
	  ;; This prevents same buf in two different windows being
	  ;; put into the list twice.
	  (setq ido-bufs-in-frame

			   '(lambda (x y z) (message "Doesn't work yet, sorry!"))))
	      ;; else running Emacs
	      ;;(add-hook 'completion-setup-hook 'completion-setup-function)
	      (display-completion-list completion-list)))))))

(defun ido-kill-buffer-internal (buf)
  "Kill buffer BUF and rebuild ido's buffer list if needed."
  (if (not (kill-buffer buf))
      ;; buffer couldn't be killed.
      (setq ido-rescan t)
    ;; else buffer was killed so remove name from list.
    (setq ido-cur-list (delq buf ido-cur-list))
    ;; Some packages, like uniquify.el, may rename buffers when one
    ;; is killed, so we need to test this condition to avoid using
    ;; an outdated list of buffer names. We don't want to always
    ;; rebuild the list of buffers, as this alters the previous
    ;; buffer order that the user was seeing on the prompt. However,
    ;; when we rebuild the list, we try to keep the previous second
    ;; buffer as the first one.
    (catch 'update
      (dolist (b ido-cur-list)
	(unless (get-buffer b)
	  (setq ido-cur-list (ido-make-buffer-list (cadr ido-matches)))
	  (setq ido-rescan t)
	  (throw 'update nil))))))

;;; KILL CURRENT BUFFER
(defun ido-kill-buffer-at-head ()
  "Kill the buffer at the head of `ido-matches'.
If cursor is not at the end of the user input, delete to end of input."
  (interactive)
  (if (not (eobp))
      (delete-region (point) (line-end-position))
    (let ((enable-recursive-minibuffers t)
	  (buf (ido-name (car ido-matches))))
      (when buf
	(ido-kill-buffer-internal buf)
	;; Check if buffer still exists.
	(if (get-buffer buf)
	    ;; buffer couldn't be killed.
	    (setq ido-rescan t)
	  ;; else buffer was killed so remove name from list.
	  (setq ido-cur-list (delq buf ido-cur-list)))))))

;;; DELETE CURRENT FILE
(defun ido-delete-file-at-head ()
  "Delete the file at the head of `ido-matches'.
If cursor is not at the end of the user input, delete to end of input."

  (let (win newframe)
    (cond
     ((eq method 'kill)
      (if record
	  (ido-record-command 'kill-buffer buffer))
      (ido-kill-buffer-internal buffer))

     ((eq method 'other-window)
      (if record
	  (ido-record-command 'switch-to-buffer buffer))
      (switch-to-buffer-other-window buffer))

109945:c5974968dea9

(defvar ido-default-item)

;; Stores the current list of items that will be searched through.
;; The list is ordered, so that the most interesting item comes first,
;; although by default, the files visible in the current frame are put
;; at the end of the list.  Created by `ido-make-item-list'.
(defvar ido-cur-list)

;; Stores the choice list for ido-completing-read
(defvar ido-choice-list)

;; Stores the list of items which are ignored when building
;; `ido-cur-list'.  It is in no specific order.
(defvar ido-ignored-list)

  (let* ((ido-current-buffers (ido-get-buffers-in-frames 'current))
	 (ido-temp-list (ido-make-buffer-list-1 (selected-frame) ido-current-buffers)))
    (if ido-temp-list
	(nconc ido-temp-list ido-current-buffers)
      (setq ido-temp-list ido-current-buffers))
    (if default
        (setq ido-temp-list
              (cons default (delete default ido-temp-list))))
    (run-hooks 'ido-make-buffer-list-hook)
    ido-temp-list))

(defun ido-make-choice-list (default)
  ;; Return the current list of choices.

(defun ido-get-bufname (win)
  ;; Used by `ido-get-buffers-in-frames' to walk through all windows
  (let ((buf (buffer-name (window-buffer win))))
	(unless (or (member buf ido-bufs-in-frame)
		    (member buf ido-ignore-item-temp-list))
	  ;; Only add buf if it is not already in list.
	  ;; This prevents same buf in two different windows being
	  ;; put into the list twice.
	  (setq ido-bufs-in-frame

			   '(lambda (x y z) (message "Doesn't work yet, sorry!"))))
	      ;; else running Emacs
	      ;;(add-hook 'completion-setup-hook 'completion-setup-function)
	      (display-completion-list completion-list)))))))

;;; KILL CURRENT BUFFER
(defun ido-kill-buffer-at-head ()
  "Kill the buffer at the head of `ido-matches'.
If cursor is not at the end of the user input, delete to end of input."
  (interactive)
  (if (not (eobp))
      (delete-region (point) (line-end-position))
    (let ((enable-recursive-minibuffers t)
	  (buf (ido-name (car ido-matches)))
	  (nextbuf (cadr ido-matches)))
      (when (get-buffer buf)
	;; If next match names a buffer use the buffer object; buffer
	;; name may be changed by packages such as uniquify; mindful
	;; of virtual buffers.
	(when (and nextbuf (get-buffer nextbuf))
	  (setq nextbuf (get-buffer nextbuf)))
	(if (null (kill-buffer buf))
	    ;; Buffer couldn't be killed.
	    (setq ido-rescan t)
	  ;; Else `kill-buffer' succeeds so re-make the buffer list
	  ;; taking into account packages like uniquify may rename
	  ;; buffers.
	  (if (bufferp nextbuf)
	      (setq nextbuf (buffer-name nextbuf)))
	  (setq ido-default-item nextbuf
		ido-text-init ido-text
		ido-exit 'refresh)
	  (exit-minibuffer))))))

;;; DELETE CURRENT FILE
(defun ido-delete-file-at-head ()
  "Delete the file at the head of `ido-matches'.
If cursor is not at the end of the user input, delete to end of input."

  (let (win newframe)
    (cond
     ((eq method 'kill)
      (if record
	  (ido-record-command 'kill-buffer buffer))
      (kill-buffer buffer))

     ((eq method 'other-window)
      (if record
	  (ido-record-command 'switch-to-buffer buffer))
      (switch-to-buffer-other-window buffer))