comparison lisp/minibuf.el @ 318:afd57c14dfc8 r21-0b57

Import from CVS: tag r21-0b57
author cvs
date Mon, 13 Aug 2007 10:45:36 +0200
parents 9ea74add5d37
children 8e84bee8ddd0
comparison
equal deleted inserted replaced
317:a2fc9afbef65 318:afd57c14dfc8
240 (eq directory-sep-char (char-before (point))) 240 (eq directory-sep-char (char-before (point)))
241 ;; permit URL's with //, for e.g. http://hostname/~user 241 ;; permit URL's with //, for e.g. http://hostname/~user
242 (not (save-excursion (search-backward "//" nil t))) 242 (not (save-excursion (search-backward "//" nil t)))
243 (delete-region (point-min) (point))) 243 (delete-region (point-min) (point)))
244 (insert ?~)) 244 (insert ?~))
245
245 246
246 (defvar read-file-name-map 247 (defvar read-file-name-map
247 (let ((map (make-sparse-keymap 'read-file-name-map))) 248 (let ((map (make-sparse-keymap 'read-file-name-map)))
248 (set-keymap-parents map (list minibuffer-local-completion-map)) 249 (set-keymap-parents map (list minibuffer-local-completion-map))
249 (define-key map (vector directory-sep-char) 'minibuffer-electric-separator) 250 (define-key map (vector directory-sep-char) 'minibuffer-electric-separator)
445 (setq current-minibuffer-contents (car initial-contents) 446 (setq current-minibuffer-contents (car initial-contents)
446 current-minibuffer-point (cdr initial-contents))) 447 current-minibuffer-point (cdr initial-contents)))
447 (insert initial-contents) 448 (insert initial-contents)
448 (setq current-minibuffer-contents initial-contents 449 (setq current-minibuffer-contents initial-contents
449 current-minibuffer-point (point)))) 450 current-minibuffer-point (point))))
450 (use-local-map (or keymap minibuffer-local-map)) 451 (use-local-map (help-keymap-with-help-key
452 (or keymap minibuffer-local-map)
453 minibuffer-help-form))
451 (let ((mouse-grabbed-buffer 454 (let ((mouse-grabbed-buffer
452 (and minibuffer-smart-completion-tracking-behavior 455 (and minibuffer-smart-completion-tracking-behavior
453 (current-buffer))) 456 (current-buffer)))
454 (current-prefix-arg current-prefix-arg) 457 (current-prefix-arg current-prefix-arg)
455 (help-form minibuffer-help-form) 458 ;; (help-form minibuffer-help-form)
456 (minibuffer-history-variable (cond ((not _history_) 459 (minibuffer-history-variable (cond ((not _history_)
457 'minibuffer-history) 460 'minibuffer-history)
458 ((consp _history_) 461 ((consp _history_)
459 (car _history_)) 462 (car _history_))
460 (t 463 (t