Mercurial > hg > xemacs-beta
comparison lisp/vm/vm-minibuf.el @ 98:0d2f883870bc r20-1b1
Import from CVS: tag r20-1b1
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:13:56 +0200 |
| parents | 131b0175ea99 |
| children | 4be1180a9e89 |
comparison
equal
deleted
inserted
replaced
| 97:498bf5da1c90 | 98:0d2f883870bc |
|---|---|
| 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 command) | 184 (define-key keymap 'button1 command) |
| 185 (define-key keymap 'button2 command) | 185 (define-key keymap 'button2 command)) |
| 186 (define-key keymap 'button3 command)) | |
| 187 ((vm-mouse-fsfemacs-mouse-p) | 186 ((vm-mouse-fsfemacs-mouse-p) |
| 188 (define-key keymap [down-mouse-1] 'ignore) | 187 (define-key keymap [down-mouse-1] 'ignore) |
| 189 (define-key keymap [drag-mouse-1] 'ignore) | 188 (define-key keymap [drag-mouse-1] 'ignore) |
| 190 (define-key keymap [mouse-1] command) | 189 (define-key keymap [mouse-1] command) |
| 191 (define-key keymap [drag-mouse-2] 'ignore) | 190 (define-key keymap [drag-mouse-2] 'ignore) |
| 192 (define-key keymap [down-mouse-2] 'ignore) | 191 (define-key keymap [down-mouse-2] 'ignore) |
| 193 (define-key keymap [mouse-2] command) | 192 (define-key keymap [mouse-2] command))) |
| 194 (define-key keymap [drag-mouse-3] 'ignore) | |
| 195 (define-key keymap [down-mouse-3] 'ignore) | |
| 196 (define-key keymap [mouse-3] command))) | |
| 197 (setq keymaps (cdr keymaps))))) | 193 (setq keymaps (cdr keymaps))))) |
| 198 (setq w (vm-get-buffer-window (current-buffer))) | 194 (setq w (vm-get-buffer-window (current-buffer))) |
| 199 (setq q list | 195 (setq q list |
| 200 list-length 0 | 196 list-length 0 |
| 201 longest 0) | 197 longest 0) |
| 264 (define-key minibuffer-local-map " " 'vm-minibuffer-complete-word) | 260 (define-key minibuffer-local-map " " 'vm-minibuffer-complete-word) |
| 265 (define-key minibuffer-local-map "?" 'vm-minibuffer-completion-help) | 261 (define-key minibuffer-local-map "?" 'vm-minibuffer-completion-help) |
| 266 (if (not multi-word) | 262 (if (not multi-word) |
| 267 (define-key minibuffer-local-map "\r" | 263 (define-key minibuffer-local-map "\r" |
| 268 'vm-minibuffer-complete-word-and-exit)) | 264 'vm-minibuffer-complete-word-and-exit)) |
| 269 (read-string prompt))) | 265 ;; evade the XEmacs dialox box, yeccch. |
| 266 (let ((should-use-dialog-box nil)) | |
| 267 (read-string prompt)))) | |
| 270 | 268 |
| 271 (defvar last-nonmenu-event) | 269 (defvar last-nonmenu-event) |
| 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 |
| 360 (and input-buffer (kill-buffer input-buffer))))))) | 358 (and input-buffer (kill-buffer input-buffer))))))) |
| 361 | 359 |
| 362 (defun vm-keyboard-read-file-name (prompt &optional dir default | 360 (defun vm-keyboard-read-file-name (prompt &optional dir default |
| 363 must-match initial history) | 361 must-match initial history) |
| 364 "Like read-file-name, except HISTORY's value is unaltered." | 362 "Like read-file-name, except HISTORY's value is unaltered." |
| 365 (let ((oldvalue (symbol-value history))) | 363 (let ((oldvalue (symbol-value history)) |
| 364 ;; evade the XEmacs dialox box, yeccch. | |
| 365 (should-use-dialog-box nil)) | |
| 366 (unwind-protect | 366 (unwind-protect |
| 367 (condition-case nil | 367 (condition-case nil |
| 368 (read-file-name prompt dir default must-match initial history) | 368 (read-file-name prompt dir default must-match initial history) |
| 369 (wrong-number-of-arguments | 369 (wrong-number-of-arguments |
| 370 (if history | 370 (if history |