projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* rfc2047.el (rfc2047-qp-or-base64): New function to reduce
[gnus]
/
lisp
/
gnus-uu.el
diff --git
a/lisp/gnus-uu.el
b/lisp/gnus-uu.el
index
121c2b7
..
761398a
100644
(file)
--- a/
lisp/gnus-uu.el
+++ b/
lisp/gnus-uu.el
@@
-510,11
+510,11
@@
didn't work, and overwrite existing files. Otherwise, ask each time."
"Various"))))
(goto-char (point-min))
(when (re-search-forward "^Subject: ")
"Various"))))
(goto-char (point-min))
(when (re-search-forward "^Subject: ")
- (delete-region (point) (
gnus-
point-at-eol))
+ (delete-region (point) (point-at-eol))
(insert subject))
(goto-char (point-min))
(when (re-search-forward "^From:")
(insert subject))
(goto-char (point-min))
(when (re-search-forward "^From:")
- (delete-region (point) (
gnus-
point-at-eol))
+ (delete-region (point) (point-at-eol))
(insert " " from))
(let ((message-forward-decoded-p t))
(message-forward post t))))
(insert " " from))
(let ((message-forward-decoded-p t))
(message-forward post t))))
@@
-849,7
+849,7
@@
When called interactively, prompt for REGEXP."
(save-restriction
(set-buffer buffer)
(let (buffer-read-only)
(save-restriction
(set-buffer buffer)
(let (buffer-read-only)
- (
gnus-
set-text-properties (point-min) (point-max) nil)
+ (set-text-properties (point-min) (point-max) nil)
;; These two are necessary for XEmacs 19.12 fascism.
(put-text-property (point-min) (point-max) 'invisible nil)
(put-text-property (point-min) (point-max) 'intangible nil))
;; These two are necessary for XEmacs 19.12 fascism.
(put-text-property (point-min) (point-max) 'invisible nil)
(put-text-property (point-min) (point-max) 'intangible nil))
@@
-1403,7
+1403,7
@@
When called interactively, prompt for REGEXP."
(setq part (match-string 0 subject))
(setq subject (substring subject (match-end 0)))))
(or part
(setq part (match-string 0 subject))
(setq subject (substring subject (match-end 0)))))
(or part
- (while (string-match "
\\([0-9]+\\)[^0-9]+\\([0-9]+\\)
" subject)
+ (while (string-match "
[0-9]+[^0-9]+[0-9]+
" subject)
(setq part (match-string 0 subject))
(setq subject (substring subject (match-end 0)))))
(or part "")))
(setq part (match-string 0 subject))
(setq subject (substring subject (match-end 0)))))
(or part "")))
@@
-1438,9
+1438,9
@@
When called interactively, prompt for REGEXP."
;; This is the beginning of a uuencoded article.
;; We replace certain characters that could make things messy.
(setq gnus-uu-file-name
;; This is the beginning of a uuencoded article.
;; We replace certain characters that could make things messy.
(setq gnus-uu-file-name
- (
let ((nnheader-file-name-translation-alist
- '((?/ . ?,) (? . ?_) (?* . ?_) (?$ . ?_))))
-
(nnheader-translate-file-chars
(match-string 1))))
+ (
gnus-map-function
+ mm-file-name-rewrite-functions
+
(file-name-nondirectory
(match-string 1))))
(replace-match (concat "begin 644 " gnus-uu-file-name) t t)
;; Remove any non gnus-uu-body-line right after start.
(replace-match (concat "begin 644 " gnus-uu-file-name) t t)
;; Remove any non gnus-uu-body-line right after start.
@@
-1630,7
+1630,7
@@
Gnus might fail to display all of it.")
(gnus-message 5 "Unpacking: %s..." (gnus-uu-command action file-path))
(gnus-message 5 "Unpacking: %s..." (gnus-uu-command action file-path))
- (if (
=
0 (call-process shell-file-name nil
+ (if (
eq
0 (call-process shell-file-name nil
(gnus-get-buffer-create gnus-uu-output-buffer-name)
nil shell-command-switch command))
(message "")
(gnus-get-buffer-create gnus-uu-output-buffer-name)
nil shell-command-switch command))
(message "")
@@
-1705,8
+1705,7
@@
Gnus might fail to display all of it.")
(defun gnus-uu-check-correct-stripped-uucode (start end)
(save-excursion
(let (found beg length)
(defun gnus-uu-check-correct-stripped-uucode (start end)
(save-excursion
(let (found beg length)
- (if (not gnus-uu-correct-stripped-uucode)
- ()
+ (unless gnus-uu-correct-stripped-uucode
(goto-char start)
(if (re-search-forward " \\|`" end t)
(goto-char start)
(if (re-search-forward " \\|`" end t)
@@
-1719,19
+1718,15
@@
Gnus might fail to display all of it.")
(forward-line 1))))
(while (not (eobp))
(forward-line 1))))
(while (not (eobp))
- (if (looking-at (concat gnus-uu-begin-string "\\|"
- gnus-uu-end-string))
- ()
+ (unless (looking-at (concat gnus-uu-begin-string "\\|"
+ gnus-uu-end-string))
(when (not found)
(when (not found)
- (beginning-of-line)
- (setq beg (point))
- (end-of-line)
- (setq length (- (point) beg)))
+ (setq length (- (point-at-eol) (point-at-bol))))
(setq found t)
(beginning-of-line)
(setq beg (point))
(end-of-line)
(setq found t)
(beginning-of-line)
(setq beg (point))
(end-of-line)
- (
when (not (= length (- (point) beg)
))
+ (
unless (= length (- (point) beg
))
(insert (make-string (- length (- (point) beg)) ? ))))
(forward-line 1)))))))
(insert (make-string (- length (- (point) beg)) ? ))))
(forward-line 1)))))))
@@
-1776,7
+1771,7
@@
Gnus might fail to display all of it.")
;; that the filename will be treated as a single argument when the shell
;; executes the command.
(defun gnus-uu-command (action file)
;; that the filename will be treated as a single argument when the shell
;; executes the command.
(defun gnus-uu-command (action file)
- (let ((quoted-file (
mm-quote-arg
file)))
+ (let ((quoted-file (
shell-quote-argument
file)))
(if (string-match "%s" action)
(format action quoted-file)
(concat action " " quoted-file))))
(if (string-match "%s" action)
(format action quoted-file)
(concat action " " quoted-file))))
@@
-1912,8
+1907,8
@@
The user will be asked for a file name."
;; Encodes with base64 and adds MIME headers
(defun gnus-uu-post-encode-mime (path file-name)
;; Encodes with base64 and adds MIME headers
(defun gnus-uu-post-encode-mime (path file-name)
- (when (
zerop
(call-process shell-file-name nil t nil shell-command-switch
-
(format "%s %s -o %s" "mmencode" path file-name)))
+ (when (
eq 0
(call-process shell-file-name nil t nil shell-command-switch
+ (format "%s %s -o %s" "mmencode" path file-name)))
(gnus-uu-post-make-mime file-name "base64")
t))
(gnus-uu-post-make-mime file-name "base64")
t))
@@
-1938,8
+1933,8
@@
The user will be asked for a file name."
;; Encodes a file PATH with COMMAND, leaving the result in the
;; current buffer.
(defun gnus-uu-post-encode-file (command path file-name)
;; Encodes a file PATH with COMMAND, leaving the result in the
;; current buffer.
(defun gnus-uu-post-encode-file (command path file-name)
- (
=
0 (call-process shell-file-name nil t nil shell-command-switch
- (format "%s %s %s" command path file-name))))
+ (
eq
0 (call-process shell-file-name nil t nil shell-command-switch
+
(format "%s %s %s" command path file-name))))
(defun gnus-uu-post-news-inews ()
"Posts the composed news article and encoded file.
(defun gnus-uu-post-news-inews ()
"Posts the composed news article and encoded file.
@@
-2031,8
+2026,7
@@
If no file has been included, the user will be asked for a file."
(goto-char (point-min))
(re-search-forward
(concat "^" (regexp-quote mail-header-separator) "$") nil t)
(goto-char (point-min))
(re-search-forward
(concat "^" (regexp-quote mail-header-separator) "$") nil t)
- (beginning-of-line)
- (setq header (buffer-substring (point-min) (point)))
+ (setq header (buffer-substring (point-min) (point-at-bol)))
(goto-char (point-min))
(when gnus-uu-post-separate-description
(goto-char (point-min))
(when gnus-uu-post-separate-description
@@
-2108,8
+2102,7
@@
If no file has been included, the user will be asked for a file."
(when (not gnus-uu-post-separate-description)
(set-buffer-modified-p nil)
(when (not gnus-uu-post-separate-description)
(set-buffer-modified-p nil)
- (when (fboundp 'bury-buffer)
- (bury-buffer)))))
+ (bury-buffer))))
(provide 'gnus-uu)
(provide 'gnus-uu)