Mercurial > hg > xemacs-beta
comparison lisp/efs/default-dir.el @ 118:7d55a9ba150c r20-1b11
Import from CVS: tag r20-1b11
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:24:17 +0200 |
parents | 9f59509498e1 |
children |
comparison
equal
deleted
inserted
replaced
117:578fd4947a72 | 118:7d55a9ba150c |
---|---|
338 (default-dir-real-view-file-other-frame file)) | 338 (default-dir-real-view-file-other-frame file)) |
339 (efs-overwrite-fn "default-dir" 'view-file-other-frame | 339 (efs-overwrite-fn "default-dir" 'view-file-other-frame |
340 'default-dir-view-file-other-frame))) | 340 'default-dir-view-file-other-frame))) |
341 | 341 |
342 | 342 |
343 (defun default-dir-shell-command (command &optional insert) | 343 (defun default-dir-shell-command (command &optional output-buffer) |
344 "Documented as original" | 344 "Documented as original" |
345 (interactive | 345 (interactive |
346 (list | 346 (list |
347 (let ((prompt (format "Shell command in %s: " (default-directory)))) | 347 (let ((prompt (format "Shell command in %s: " (default-directory)))) |
348 (cond | 348 (cond |
349 ((memq default-dir-emacs-variant '(fsf-19 xemacs)) | 349 ((eq default-dir-emacs-variant 'xemacs) |
350 (read-from-minibuffer prompt nil nil nil | 350 (read-shell-command "Shell command: ")) |
351 'shell-command-history)) | 351 ((eq default-dir-emacs-variant 'fsf-19) |
352 (read-from-minibuffer prompt nil nil nil 'shell-command-history)) | |
352 ((featurep 'gmhist) | 353 ((featurep 'gmhist) |
353 (let ((minibuffer-history-symbol 'shell-command-history)) | 354 (let ((minibuffer-history-symbol 'shell-command-history)) |
354 (read-string prompt))) | 355 (read-string prompt))) |
355 (t (read-string prompt)))) | 356 (t (read-string prompt)))) |
356 current-prefix-arg)) | 357 current-prefix-arg)) |
357 (let ((default-directory (expand-file-name (default-directory)))) | 358 (let ((default-directory (expand-file-name (default-directory)))) |
358 (default-dir-real-shell-command command insert))) | 359 (default-dir-real-shell-command command output-buffer))) |
359 | 360 |
360 (efs-overwrite-fn "default-dir" 'shell-command 'default-dir-shell-command) | 361 (efs-overwrite-fn "default-dir" 'shell-command 'default-dir-shell-command) |
361 | 362 |
362 (defun default-dir-cd (dir) | 363 (defun default-dir-cd (dir) |
363 "Documented as original" | 364 "Documented as original" |