diff options
| author | Dave Love | 2000-10-30 19:10:33 +0000 |
|---|---|---|
| committer | Dave Love | 2000-10-30 19:10:33 +0000 |
| commit | 4325195cd6562dd1d0dc507ac2a353d0396cbb57 (patch) | |
| tree | e54444288aa0bd08525e88efaca38622cb7e0228 | |
| parent | eaf67bae39058025177763693eb2821c936f5fd0 (diff) | |
| download | emacs-4325195cd6562dd1d0dc507ac2a353d0396cbb57.tar.gz emacs-4325195cd6562dd1d0dc507ac2a353d0396cbb57.zip | |
Fix 2000-10-27 change properly.
| -rw-r--r-- | lisp/gnus/gnus-art.el | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 6c36d76d7aa..363bab1841b 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -2305,76 +2305,76 @@ This format is defined by the `gnus-article-time-format' variable." | |||
| 2305 | (let ((default-name | 2305 | (let ((default-name |
| 2306 | (funcall function group headers (symbol-value variable))) | 2306 | (funcall function group headers (symbol-value variable))) |
| 2307 | result) | 2307 | result) |
| 2308 | (setq | 2308 | (setq result |
| 2309 | result | 2309 | (expand-file-name |
| 2310 | (cond | 2310 | (cond |
| 2311 | ((eq filename 'default) | 2311 | ((eq filename 'default) |
| 2312 | default-name) | 2312 | default-name) |
| 2313 | ((eq filename t) | 2313 | ((eq filename t) |
| 2314 | default-name) | 2314 | default-name) |
| 2315 | (filename filename) | 2315 | (filename filename) |
| 2316 | (t | 2316 | (t |
| 2317 | (let* ((split-name (gnus-get-split-value gnus-split-methods)) | 2317 | (let* ((split-name (gnus-get-split-value gnus-split-methods)) |
| 2318 | (prompt | 2318 | (prompt |
| 2319 | (format prompt | 2319 | (format prompt |
| 2320 | (if (and gnus-number-of-articles-to-be-saved | 2320 | (if (and gnus-number-of-articles-to-be-saved |
| 2321 | (> gnus-number-of-articles-to-be-saved 1)) | 2321 | (> gnus-number-of-articles-to-be-saved 1)) |
| 2322 | (format "these %d articles" | 2322 | (format "these %d articles" |
| 2323 | gnus-number-of-articles-to-be-saved) | 2323 | gnus-number-of-articles-to-be-saved) |
| 2324 | "this article"))) | 2324 | "this article"))) |
| 2325 | (file | 2325 | (file |
| 2326 | ;; Let the split methods have their say. | 2326 | ;; Let the split methods have their say. |
| 2327 | (cond | 2327 | (cond |
| 2328 | ;; No split name was found. | 2328 | ;; No split name was found. |
| 2329 | ((null split-name) | 2329 | ((null split-name) |
| 2330 | (read-file-name | 2330 | (read-file-name |
| 2331 | (concat prompt " (default " | 2331 | (concat prompt " (default " |
| 2332 | (file-name-nondirectory default-name) ") ") | 2332 | (file-name-nondirectory default-name) ") ") |
| 2333 | (file-name-directory default-name) | 2333 | (file-name-directory default-name) |
| 2334 | default-name)) | 2334 | default-name)) |
| 2335 | ;; A single group name is returned. | 2335 | ;; A single group name is returned. |
| 2336 | ((stringp split-name) | 2336 | ((stringp split-name) |
| 2337 | (setq default-name | 2337 | (setq default-name |
| 2338 | (funcall function split-name headers | 2338 | (funcall function split-name headers |
| 2339 | (symbol-value variable))) | 2339 | (symbol-value variable))) |
| 2340 | (read-file-name | 2340 | (read-file-name |
| 2341 | (concat prompt " (default " | 2341 | (concat prompt " (default " |
| 2342 | (file-name-nondirectory default-name) ") ") | 2342 | (file-name-nondirectory default-name) ") ") |
| 2343 | (file-name-directory default-name) | 2343 | (file-name-directory default-name) |
| 2344 | default-name)) | 2344 | default-name)) |
| 2345 | ;; A single split name was found | 2345 | ;; A single split name was found |
| 2346 | ((= 1 (length split-name)) | 2346 | ((= 1 (length split-name)) |
| 2347 | (let* ((name (expand-file-name | 2347 | (let* ((name (expand-file-name |
| 2348 | (car split-name) gnus-article-save-directory)) | 2348 | (car split-name) gnus-article-save-directory)) |
| 2349 | (dir (cond ((file-directory-p name) | 2349 | (dir (cond ((file-directory-p name) |
| 2350 | (file-name-as-directory name)) | 2350 | (file-name-as-directory name)) |
| 2351 | ((file-exists-p name) name) | 2351 | ((file-exists-p name) name) |
| 2352 | (t gnus-article-save-directory)))) | 2352 | (t gnus-article-save-directory)))) |
| 2353 | (read-file-name | 2353 | (read-file-name |
| 2354 | (concat prompt " (default " name ") ") | 2354 | (concat prompt " (default " name ") ") |
| 2355 | dir name))) | 2355 | dir name))) |
| 2356 | ;; A list of splits was found. | 2356 | ;; A list of splits was found. |
| 2357 | (t | 2357 | (t |
| 2358 | (setq split-name (nreverse split-name)) | 2358 | (setq split-name (nreverse split-name)) |
| 2359 | (let (result) | 2359 | (let (result) |
| 2360 | (let ((file-name-history | 2360 | (let ((file-name-history |
| 2361 | (nconc split-name file-name-history))) | 2361 | (nconc split-name file-name-history))) |
| 2362 | (setq result | 2362 | (setq result |
| 2363 | (expand-file-name | 2363 | (expand-file-name |
| 2364 | (read-file-name | 2364 | (read-file-name |
| 2365 | (concat prompt " (`M-p' for defaults) ") | 2365 | (concat prompt " (`M-p' for defaults) ") |
| 2366 | gnus-article-save-directory | 2366 | gnus-article-save-directory |
| 2367 | (car split-name)) | 2367 | (car split-name)) |
| 2368 | gnus-article-save-directory))) | 2368 | gnus-article-save-directory))) |
| 2369 | (car (push result file-name-history))))))) | 2369 | (car (push result file-name-history))))))) |
| 2370 | ;; Create the directory. | 2370 | ;; Create the directory. |
| 2371 | (gnus-make-directory (file-name-directory file)) | 2371 | (gnus-make-directory (file-name-directory file)) |
| 2372 | ;; If we have read a directory, we append the default file name. | 2372 | ;; If we have read a directory, we append the default file name. |
| 2373 | (when (file-directory-p file) | 2373 | (when (file-directory-p file) |
| 2374 | (setq file (expand-file-name (file-name-nondirectory default-name) | 2374 | (setq file (expand-file-name (file-name-nondirectory default-name) |
| 2375 | (file-name-as-directory file)))) | 2375 | (file-name-as-directory file)))) |
| 2376 | ;; Possibly translate some characters. | 2376 | ;; Possibly translate some characters. |
| 2377 | (nnheader-translate-file-chars file))))) | 2377 | (nnheader-translate-file-chars file)))))) |
| 2378 | (gnus-make-directory (file-name-directory result)) | 2378 | (gnus-make-directory (file-name-directory result)) |
| 2379 | (set variable result))) | 2379 | (set variable result))) |
| 2380 | 2380 | ||