Mercurial > hg > xemacs-beta
comparison lisp/vm/vm-minibuf.el @ 54:05472e90ae02 r19-16-pre2
Import from CVS: tag r19-16-pre2
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:57:55 +0200 |
parents | c53a95d3c46d |
children | 131b0175ea99 |
comparison
equal
deleted
inserted
replaced
53:875393c1a535 | 54:05472e90ae02 |
---|---|
179 '((string (vm-mouse-get-mouse-track-string e))) | 179 '((string (vm-mouse-get-mouse-track-string e))) |
180 (list 'and 'string (list function 'string))))) | 180 (list 'and 'string (list function 'string))))) |
181 (while keymaps | 181 (while keymaps |
182 (setq keymap (car keymaps)) | 182 (setq keymap (car keymaps)) |
183 (cond ((vm-mouse-xemacs-mouse-p) | 183 (cond ((vm-mouse-xemacs-mouse-p) |
184 (define-key keymap 'button1 'ignore) | 184 (define-key keymap 'button1 command) |
185 (define-key keymap 'button2 'ignore) | 185 (define-key keymap 'button2 command)) |
186 (define-key keymap 'button1up command) | |
187 (define-key keymap 'button2up command)) | |
188 ((vm-mouse-fsfemacs-mouse-p) | 186 ((vm-mouse-fsfemacs-mouse-p) |
189 (define-key keymap [down-mouse-1] 'ignore) | 187 (define-key keymap [down-mouse-1] 'ignore) |
190 (define-key keymap [drag-mouse-1] 'ignore) | 188 (define-key keymap [drag-mouse-1] 'ignore) |
191 (define-key keymap [mouse-1] command) | 189 (define-key keymap [mouse-1] command) |
192 (define-key keymap [drag-mouse-2] 'ignore) | 190 (define-key keymap [drag-mouse-2] 'ignore) |
272 | 270 |
273 (defun vm-read-string (prompt completion-list &optional multi-word) | 271 (defun vm-read-string (prompt completion-list &optional multi-word) |
274 ;; handle alist | 272 ;; handle alist |
275 (if (consp (car completion-list)) | 273 (if (consp (car completion-list)) |
276 (setq completion-list (nreverse (mapcar 'car completion-list)))) | 274 (setq completion-list (nreverse (mapcar 'car completion-list)))) |
277 (if (and completion-list (vm-mouse-support-possible-p)) | 275 (if (and completion-list (vm-mouse-support-possible-here-p)) |
278 (cond ((and (vm-mouse-xemacs-mouse-p) | 276 (cond ((and (vm-mouse-xemacs-mouse-p) |
279 (or (button-press-event-p last-command-event) | 277 (or (button-press-event-p last-command-event) |
280 (button-release-event-p last-command-event) | 278 (button-release-event-p last-command-event) |
281 (menu-event-p last-command-event))) | 279 (menu-event-p last-command-event))) |
282 (vm-mouse-read-string prompt completion-list multi-word)) | 280 (vm-mouse-read-string prompt completion-list multi-word)) |
380 | 378 |
381 (defun vm-read-file-name (prompt &optional dir default | 379 (defun vm-read-file-name (prompt &optional dir default |
382 must-match initial history) | 380 must-match initial history) |
383 "Like read-file-name, except a mouse interface is used if a mouse | 381 "Like read-file-name, except a mouse interface is used if a mouse |
384 click mouse triggered the current command." | 382 click mouse triggered the current command." |
385 (if (vm-mouse-support-possible-p) | 383 (if (vm-mouse-support-possible-here-p) |
386 (cond ((and (vm-mouse-xemacs-mouse-p) | 384 (cond ((and (vm-mouse-xemacs-mouse-p) |
387 (or (button-press-event-p last-command-event) | 385 (or (button-press-event-p last-command-event) |
388 (button-release-event-p last-command-event) | 386 (button-release-event-p last-command-event) |
389 (menu-event-p last-command-event))) | 387 (menu-event-p last-command-event))) |
390 (vm-mouse-read-file-name prompt dir default | 388 (vm-mouse-read-file-name prompt dir default |