[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog filecache.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog filecache.el |
Date: |
Sat, 24 Oct 2009 03:51:55 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/10/24 03:51:54
Modified files:
lisp : ChangeLog filecache.el
Log message:
(file-cache-completions-keymap): Bind mouse-2 to
file-cache-choose-completion.
(file-cache-choose-completion): Handle an optional event argument.
(file-cache-mouse-choose-completion): Make it an obsolete alias.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16497&r2=1.16498
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/filecache.el?cvsroot=emacs&r1=1.39&r2=1.40
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16497
retrieving revision 1.16498
diff -u -b -r1.16497 -r1.16498
--- ChangeLog 24 Oct 2009 03:50:20 -0000 1.16497
+++ ChangeLog 24 Oct 2009 03:51:51 -0000 1.16498
@@ -4,6 +4,11 @@
* term.el (term-dynamic-list-completions): Use choose-completion rather
than obsolete alias mouse-choose-completion.
+ * filecache.el (file-cache-completions-keymap): Bind mouse-2 to
+ file-cache-choose-completion.
+ (file-cache-choose-completion): Handle an optional event argument.
+ (file-cache-mouse-choose-completion): Make it an obsolete alias.
+
* progmodes/octave-mod.el (octave-complete-symbol): Use
choose-completion if mouse-choose-completion is ever removed.
Index: filecache.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/filecache.el,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- filecache.el 5 Jan 2009 03:19:08 -0000 1.39
+++ filecache.el 24 Oct 2009 03:51:54 -0000 1.40
@@ -1,11 +1,11 @@
;;; filecache.el --- find files using a pre-loaded cache
-;;
+
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+;; 2008, 2009 Free Software Foundation, Inc.
+
;; Author: Peter Breton <address@hidden>
;; Created: Sun Nov 10 1996
;; Keywords: convenience
-;;
-;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -260,7 +260,7 @@
(defvar file-cache-completions-keymap
(let ((map (make-sparse-keymap)))
(set-keymap-parent map completion-list-mode-map)
- (define-key map [mouse-2] 'file-cache-mouse-choose-completion)
+ (define-key map [mouse-2] 'file-cache-choose-completion)
(define-key map "\C-m" 'file-cache-choose-completion)
map)
"Keymap for file cache completions buffer.")
@@ -655,25 +655,16 @@
(with-current-buffer standard-output ;; i.e. file-cache-completions-buffer
(use-local-map file-cache-completions-keymap)))
-(defun file-cache-choose-completion ()
+(defun file-cache-choose-completion (&optional event)
"Choose a completion in the `*Completions*' buffer."
- (interactive)
+ (interactive (list last-nonmenu-event))
(let ((completion-no-auto-exit t))
- (choose-completion)
+ (choose-completion event)
(select-window (active-minibuffer-window))
- (file-cache-minibuffer-complete nil)
- )
- )
+ (file-cache-minibuffer-complete nil)))
-(defun file-cache-mouse-choose-completion (event)
- "Choose a completion with the mouse."
- (interactive "e")
- (let ((completion-no-auto-exit t))
- (mouse-choose-completion event)
- (select-window (active-minibuffer-window))
- (file-cache-minibuffer-complete nil)
- )
- )
+(define-obsolete-function-alias 'file-cache-mouse-choose-completion
+ 'file-cache-choose-completion "23.2")
(defun file-cache-complete ()
"Complete the word at point, using the filecache."
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog filecache.el,
Glenn Morris <=