projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix thread marking on dummy roots
[gnus]
/
lisp
/
gnus-uu.el
diff --git
a/lisp/gnus-uu.el
b/lisp/gnus-uu.el
index
614a52c
..
16ed4f1
100644
(file)
--- a/
lisp/gnus-uu.el
+++ b/
lisp/gnus-uu.el
@@
-1,7
+1,7
@@
;;; gnus-uu.el --- extract (uu)encoded files in Gnus
;;; gnus-uu.el --- extract (uu)encoded files in Gnus
-;; Copyright (C) 1985
, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
-;;
2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
Foundation, Inc.
+;; Copyright (C) 1985
-1987, 1993-1998, 2000-2013 Free Software
+;; Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Created: 2 Oct 1993
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Created: 2 Oct 1993
@@
-41,7
+41,7
@@
:group 'gnus)
(defgroup gnus-extract-view nil
:group 'gnus)
(defgroup gnus-extract-view nil
- "View
w
ing extracted files."
+ "Viewing extracted files."
:group 'gnus-extract)
(defgroup gnus-extract-archive nil
:group 'gnus-extract)
(defgroup gnus-extract-archive nil
@@
-335,7
+335,6
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
(defvar gnus-uu-shar-begin-string "^#! */bin/sh")
(defvar gnus-uu-shar-begin-string "^#! */bin/sh")
-(defvar gnus-uu-shar-file-name nil)
(defvar gnus-uu-shar-name-marker
"begin 0?[0-7][0-7][0-7][ \t]+\\(\\(\\w\\|[.\\:]\\)*\\b\\)")
(defvar gnus-uu-shar-name-marker
"begin 0?[0-7][0-7][0-7][ \t]+\\(\\(\\w\\|[.\\:]\\)*\\b\\)")
@@
-367,7
+366,7
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
(interactive
(list current-prefix-arg
(file-name-as-directory
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-
file
-name "Uudecode and save in dir: "
+ (read-
directory
-name "Uudecode and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-uustrip-article n dir nil nil t))
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-uustrip-article n dir nil nil t))
@@
-382,7
+381,7
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
(interactive
(list current-prefix-arg
(file-name-as-directory
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-
file
-name "Unshar and save in dir: "
+ (read-
directory
-name "Unshar and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-unshar-article n dir nil 'scan t))
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-unshar-article n dir nil 'scan t))
@@
-391,12
+390,11
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
"Saves the current article."
(interactive
(list current-prefix-arg
"Saves the current article."
(interactive
(list current-prefix-arg
- (read-file-name
- (if gnus-uu-save-separate-articles
- "Save articles in dir: "
- "Save articles in file: ")
- gnus-uu-default-dir
- gnus-uu-default-dir)))
+ (if gnus-uu-save-separate-articles
+ (read-directory-name
+ "Save articles in dir: " gnus-uu-default-dir gnus-uu-default-dir)
+ (read-file-name
+ "Save article in file: " gnus-uu-default-dir gnus-uu-default-dir))))
(setq gnus-uu-saved-article-name file)
(gnus-uu-decode-with-method 'gnus-uu-save-article n nil t))
(setq gnus-uu-saved-article-name file)
(gnus-uu-decode-with-method 'gnus-uu-save-article n nil t))
@@
-405,7
+403,7
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
(interactive
(list current-prefix-arg
(file-name-as-directory
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-
file
-name "Unbinhex and save in dir: "
+ (read-
directory
-name "Unbinhex and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir))))
(setq gnus-uu-binhex-article-name
gnus-uu-default-dir
gnus-uu-default-dir))))
(setq gnus-uu-binhex-article-name
@@
-417,7
+415,7
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
(interactive
(list current-prefix-arg
(file-name-as-directory
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-
file
-name "yEnc decode and save in dir: "
+ (read-
directory
-name "yEnc decode and save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir))))
(setq gnus-uu-yenc-article-name nil)
gnus-uu-default-dir
gnus-uu-default-dir))))
(setq gnus-uu-yenc-article-name nil)
@@
-459,10
+457,11
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
"Saves and views the current article."
(interactive
(list current-prefix-arg
"Saves and views the current article."
(interactive
(list current-prefix-arg
- (read-file-name (if gnus-uu-save-separate-articles
- "Save articles is dir: "
- "Save articles in file: ")
- gnus-uu-default-dir gnus-uu-default-dir)))
+ (if gnus-uu-save-separate-articles
+ (read-directory-name "Save articles in dir: "
+ gnus-uu-default-dir gnus-uu-default-dir)
+ (read-file-name "Save articles in file: "
+ gnus-uu-default-dir gnus-uu-default-dir))))
(let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
(gnus-uu-decode-save n file)))
(let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
(gnus-uu-decode-save n file)))
@@
-641,7
+640,7
@@
When called interactively, prompt for REGEXP."
(let ((level (gnus-summary-thread-level)))
(while (and (gnus-summary-set-process-mark
(gnus-summary-article-number))
(let ((level (gnus-summary-thread-level)))
(while (and (gnus-summary-set-process-mark
(gnus-summary-article-number))
- (zerop (
gnus-summary-next-subject 1 nil t
))
+ (zerop (
forward-line 1
))
(> (gnus-summary-thread-level) level)))))
(gnus-summary-position-point))
(> (gnus-summary-thread-level) level)))))
(gnus-summary-position-point))
@@
-651,7
+650,7
@@
When called interactively, prompt for REGEXP."
(let ((level (gnus-summary-thread-level)))
(while (and (gnus-summary-remove-process-mark
(gnus-summary-article-number))
(let ((level (gnus-summary-thread-level)))
(while (and (gnus-summary-remove-process-mark
(gnus-summary-article-number))
- (zerop (
gnus-summary-next-subject
1))
+ (zerop (
forward-line
1))
(> (gnus-summary-thread-level) level))))
(gnus-summary-position-point))
(> (gnus-summary-thread-level) level))))
(gnus-summary-position-point))
@@
-728,7
+727,7
@@
When called interactively, prompt for REGEXP."
;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>.
(defun gnus-uu-decode-postscript (&optional n)
;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>.
(defun gnus-uu-decode-postscript (&optional n)
- "Gets
posts
cript of the current article."
+ "Gets
PostS
cript of the current article."
(interactive "P")
(gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n))
(interactive "P")
(gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n))
@@
-739,11
+738,11
@@
When called interactively, prompt for REGEXP."
(gnus-uu-decode-postscript n)))
(defun gnus-uu-decode-postscript-and-save (n dir)
(gnus-uu-decode-postscript n)))
(defun gnus-uu-decode-postscript-and-save (n dir)
- "Extracts
posts
cript and saves the current article."
+ "Extracts
PostS
cript and saves the current article."
(interactive
(list current-prefix-arg
(file-name-as-directory
(interactive
(list current-prefix-arg
(file-name-as-directory
- (read-
file
-name "Save in dir: "
+ (read-
directory
-name "Save in dir: "
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article
gnus-uu-default-dir
gnus-uu-default-dir t))))
(gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article
@@
-1291,6
+1290,7
@@
When called interactively, prompt for REGEXP."
;; the process-function has been successful and nil otherwise.
(defun gnus-uu-grab-articles (articles process-function
&optional sloppy limit no-errors)
;; the process-function has been successful and nil otherwise.
(defun gnus-uu-grab-articles (articles process-function
&optional sloppy limit no-errors)
+ (require 'gnus-async)
(let ((state 'first)
(gnus-asynchronous nil)
(gnus-inhibit-treatment t)
(let ((state 'first)
(gnus-asynchronous nil)
(gnus-inhibit-treatment t)
@@
-1615,16
+1615,6
@@
Gnus might fail to display all of it.")
gnus-shell-command-separator " sh")))))
state))
gnus-shell-command-separator " sh")))))
state))
-;; Returns the name of what the shar file is going to unpack.
-(defun gnus-uu-find-name-in-shar ()
- (let ((oldpoint (point))
- res)
- (goto-char (point-min))
- (when (re-search-forward gnus-uu-shar-name-marker nil t)
- (setq res (buffer-substring (match-beginning 1) (match-end 1))))
- (goto-char oldpoint)
- res))
-
;; `gnus-uu-choose-action' chooses what action to perform given the name
;; and `gnus-uu-file-action-list'. Returns either nil if no action is
;; found, or the name of the command to run if such a rule is found.
;; `gnus-uu-choose-action' chooses what action to perform given the name
;; and `gnus-uu-file-action-list'. Returns either nil if no action is
;; found, or the name of the command to run if such a rule is found.