comparison contrib/mercurial.el @ 2317:6d0a9de9a8ac

merge emacs patches.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 18 May 2006 22:46:27 -0700
parents 3d58376a7103 c4a2d8502cc0
children d1a7c8a5b835 74518478d2bf ff83112332f9
comparison
equal deleted inserted replaced
2316:3d58376a7103 2317:6d0a9de9a8ac
380 (save-excursion 380 (save-excursion
381 (while hg-prev-buffer 381 (while hg-prev-buffer
382 (set-buffer hg-prev-buffer)) 382 (set-buffer hg-prev-buffer))
383 (let ((path (or default (buffer-file-name)))) 383 (let ((path (or default (buffer-file-name))))
384 (if (or (not path) current-prefix-arg) 384 (if (or (not path) current-prefix-arg)
385 (expand-file-name 385 (expand-file-name
386 (read-file-name (format "File, directory or pattern%s: " 386 (eval (list* 'read-file-name
387 (or prompt "")) 387 (format "File, directory or pattern%s: "
388 (and path (file-name-directory path)) 388 (or prompt ""))
389 nil nil 389 (and path (file-name-directory path))
390 (and path (file-name-nondirectory path)) 390 nil nil
391 'hg-file-history)) 391 (and path (file-name-nondirectory path))
392 path)))) 392 (if hg-running-xemacs
393 (cons (quote 'hg-file-history) nil)
394 nil))))
395 path))))
393 396
394 (defun hg-read-number (&optional prompt default) 397 (defun hg-read-number (&optional prompt default)
395 "Read a integer value." 398 "Read a integer value."
396 (save-excursion 399 (save-excursion
397 (if (or (not default) current-prefix-arg) 400 (if (or (not default) current-prefix-arg)