Mercurial > emacs
comparison lisp/gnus/gnus-art.el @ 90233:ee12d75eb214
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-85
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 556-561)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 122-124)
- Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 25 Sep 2005 22:07:01 +0000 |
parents | fa0da9b57058 c16795de963a |
children | b1c1fc853d2f |
comparison
equal
deleted
inserted
replaced
90232:eab32348047a | 90233:ee12d75eb214 |
---|---|
3253 (cond | 3253 (cond |
3254 ;; No split name was found. | 3254 ;; No split name was found. |
3255 ((null split-name) | 3255 ((null split-name) |
3256 (read-file-name | 3256 (read-file-name |
3257 (concat prompt " (default " | 3257 (concat prompt " (default " |
3258 (file-name-nondirectory default-name) ") ") | 3258 (file-name-nondirectory default-name) "): ") |
3259 (file-name-directory default-name) | 3259 (file-name-directory default-name) |
3260 default-name)) | 3260 default-name)) |
3261 ;; A single group name is returned. | 3261 ;; A single group name is returned. |
3262 ((stringp split-name) | 3262 ((stringp split-name) |
3263 (setq default-name | 3263 (setq default-name |
3264 (funcall function split-name headers | 3264 (funcall function split-name headers |
3265 (symbol-value variable))) | 3265 (symbol-value variable))) |
3266 (read-file-name | 3266 (read-file-name |
3267 (concat prompt " (default " | 3267 (concat prompt " (default " |
3268 (file-name-nondirectory default-name) ") ") | 3268 (file-name-nondirectory default-name) "): ") |
3269 (file-name-directory default-name) | 3269 (file-name-directory default-name) |
3270 default-name)) | 3270 default-name)) |
3271 ;; A single split name was found | 3271 ;; A single split name was found |
3272 ((= 1 (length split-name)) | 3272 ((= 1 (length split-name)) |
3273 (let* ((name (expand-file-name | 3273 (let* ((name (expand-file-name |
3276 (dir (cond ((file-directory-p name) | 3276 (dir (cond ((file-directory-p name) |
3277 (file-name-as-directory name)) | 3277 (file-name-as-directory name)) |
3278 ((file-exists-p name) name) | 3278 ((file-exists-p name) name) |
3279 (t gnus-article-save-directory)))) | 3279 (t gnus-article-save-directory)))) |
3280 (read-file-name | 3280 (read-file-name |
3281 (concat prompt " (default " name ") ") | 3281 (concat prompt " (default " name "): ") |
3282 dir name))) | 3282 dir name))) |
3283 ;; A list of splits was found. | 3283 ;; A list of splits was found. |
3284 (t | 3284 (t |
3285 (setq split-name (nreverse split-name)) | 3285 (setq split-name (nreverse split-name)) |
3286 (let (result) | 3286 (let (result) |
3287 (let ((file-name-history | 3287 (let ((file-name-history |
3288 (nconc split-name file-name-history))) | 3288 (nconc split-name file-name-history))) |
3289 (setq result | 3289 (setq result |
3290 (expand-file-name | 3290 (expand-file-name |
3291 (read-file-name | 3291 (read-file-name |
3292 (concat prompt " (`M-p' for defaults) ") | 3292 (concat prompt " (`M-p' for defaults): ") |
3293 gnus-article-save-directory | 3293 gnus-article-save-directory |
3294 (car split-name)) | 3294 (car split-name)) |
3295 gnus-article-save-directory))) | 3295 gnus-article-save-directory))) |
3296 (car (push result file-name-history))))))) | 3296 (car (push result file-name-history))))))) |
3297 ;; Create the directory. | 3297 ;; Create the directory. |
3321 (defun gnus-summary-save-in-rmail (&optional filename) | 3321 (defun gnus-summary-save-in-rmail (&optional filename) |
3322 "Append this article to Rmail file. | 3322 "Append this article to Rmail file. |
3323 Optional argument FILENAME specifies file name. | 3323 Optional argument FILENAME specifies file name. |
3324 Directory to save to is default to `gnus-article-save-directory'." | 3324 Directory to save to is default to `gnus-article-save-directory'." |
3325 (setq filename (gnus-read-save-file-name | 3325 (setq filename (gnus-read-save-file-name |
3326 "Save %s in rmail file:" filename | 3326 "Save %s in rmail file" filename |
3327 gnus-rmail-save-name gnus-newsgroup-name | 3327 gnus-rmail-save-name gnus-newsgroup-name |
3328 gnus-current-headers 'gnus-newsgroup-last-rmail)) | 3328 gnus-current-headers 'gnus-newsgroup-last-rmail)) |
3329 (gnus-eval-in-buffer-window gnus-save-article-buffer | 3329 (gnus-eval-in-buffer-window gnus-save-article-buffer |
3330 (save-excursion | 3330 (save-excursion |
3331 (save-restriction | 3331 (save-restriction |
3336 (defun gnus-summary-save-in-mail (&optional filename) | 3336 (defun gnus-summary-save-in-mail (&optional filename) |
3337 "Append this article to Unix mail file. | 3337 "Append this article to Unix mail file. |
3338 Optional argument FILENAME specifies file name. | 3338 Optional argument FILENAME specifies file name. |
3339 Directory to save to is default to `gnus-article-save-directory'." | 3339 Directory to save to is default to `gnus-article-save-directory'." |
3340 (setq filename (gnus-read-save-file-name | 3340 (setq filename (gnus-read-save-file-name |
3341 "Save %s in Unix mail file:" filename | 3341 "Save %s in Unix mail file" filename |
3342 gnus-mail-save-name gnus-newsgroup-name | 3342 gnus-mail-save-name gnus-newsgroup-name |
3343 gnus-current-headers 'gnus-newsgroup-last-mail)) | 3343 gnus-current-headers 'gnus-newsgroup-last-mail)) |
3344 (gnus-eval-in-buffer-window gnus-save-article-buffer | 3344 (gnus-eval-in-buffer-window gnus-save-article-buffer |
3345 (save-excursion | 3345 (save-excursion |
3346 (save-restriction | 3346 (save-restriction |
3355 (defun gnus-summary-save-in-file (&optional filename overwrite) | 3355 (defun gnus-summary-save-in-file (&optional filename overwrite) |
3356 "Append this article to file. | 3356 "Append this article to file. |
3357 Optional argument FILENAME specifies file name. | 3357 Optional argument FILENAME specifies file name. |
3358 Directory to save to is default to `gnus-article-save-directory'." | 3358 Directory to save to is default to `gnus-article-save-directory'." |
3359 (setq filename (gnus-read-save-file-name | 3359 (setq filename (gnus-read-save-file-name |
3360 "Save %s in file:" filename | 3360 "Save %s in file" filename |
3361 gnus-file-save-name gnus-newsgroup-name | 3361 gnus-file-save-name gnus-newsgroup-name |
3362 gnus-current-headers 'gnus-newsgroup-last-file)) | 3362 gnus-current-headers 'gnus-newsgroup-last-file)) |
3363 (gnus-eval-in-buffer-window gnus-save-article-buffer | 3363 (gnus-eval-in-buffer-window gnus-save-article-buffer |
3364 (save-excursion | 3364 (save-excursion |
3365 (save-restriction | 3365 (save-restriction |
3379 (defun gnus-summary-save-body-in-file (&optional filename) | 3379 (defun gnus-summary-save-body-in-file (&optional filename) |
3380 "Append this article body to a file. | 3380 "Append this article body to a file. |
3381 Optional argument FILENAME specifies file name. | 3381 Optional argument FILENAME specifies file name. |
3382 The directory to save in defaults to `gnus-article-save-directory'." | 3382 The directory to save in defaults to `gnus-article-save-directory'." |
3383 (setq filename (gnus-read-save-file-name | 3383 (setq filename (gnus-read-save-file-name |
3384 "Save %s body in file:" filename | 3384 "Save %s body in file" filename |
3385 gnus-file-save-name gnus-newsgroup-name | 3385 gnus-file-save-name gnus-newsgroup-name |
3386 gnus-current-headers 'gnus-newsgroup-last-file)) | 3386 gnus-current-headers 'gnus-newsgroup-last-file)) |
3387 (gnus-eval-in-buffer-window gnus-save-article-buffer | 3387 (gnus-eval-in-buffer-window gnus-save-article-buffer |
3388 (save-excursion | 3388 (save-excursion |
3389 (save-restriction | 3389 (save-restriction |