projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't quote nil and t in doc strings
[gnus]
/
lisp
/
mm-uu.el
diff --git
a/lisp/mm-uu.el
b/lisp/mm-uu.el
index
200fa15
..
fa48ee9
100644
(file)
--- a/
lisp/mm-uu.el
+++ b/
lisp/mm-uu.el
@@
-1,7
+1,6
@@
;;; mm-uu.el --- Return uu stuff as mm handles
;;; mm-uu.el --- Return uu stuff as mm handles
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1998-2015 Free Software Foundation, Inc.
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
@@
-159,6
+158,18
@@
This can be either \"inline\" or \"attachment\".")
mm-uu-diff-extract
nil
mm-uu-diff-test)
mm-uu-diff-extract
nil
mm-uu-diff-test)
+ (diff
+ "^=== modified file "
+ nil
+ mm-uu-diff-extract
+ nil
+ mm-uu-diff-test)
+ (git-format-patch
+ "^diff --git "
+ "^-- "
+ mm-uu-diff-extract
+ nil
+ mm-uu-diff-test)
(message-marks
;; Text enclosed with tags similar to `message-mark-insert-begin' and
;; `message-mark-insert-end'. Don't use those variables to avoid
(message-marks
;; Text enclosed with tags similar to `message-mark-insert-begin' and
;; `message-mark-insert-end'. Don't use those variables to avoid
@@
-176,7
+187,7
@@
This can be either \"inline\" or \"attachment\".")
nil)
(verbatim-marks
;; slrn-style verbatim marks, see
nil)
(verbatim-marks
;; slrn-style verbatim marks, see
- ;; http://
www.slrn.org/manual/slrn-manual-6.html#ss6.81
+ ;; http://
slrn.sourceforge.net/docs/slrn-manual-6.html#process_verbatim_marks
"^#v\\+"
"^#v\\-$"
(lambda () (mm-uu-verbatim-marks-extract 0 0))
"^#v\\+"
"^#v\\-$"
(lambda () (mm-uu-verbatim-marks-extract 0 0))
@@
-419,7
+430,11
@@
apply the face `mm-uu-extract'."
(defun mm-uu-forward-extract ()
(mm-make-handle (mm-uu-copy-to-buffer
(defun mm-uu-forward-extract ()
(mm-make-handle (mm-uu-copy-to-buffer
- (progn (goto-char start-point) (forward-line) (point))
+ (progn
+ (goto-char start-point)
+ (forward-line)
+ (skip-chars-forward "\n")
+ (point))
(progn (goto-char end-point) (forward-line -1) (point)))
'("message/rfc822" (charset . gnus-decoded))))
(progn (goto-char end-point) (forward-line -1) (point)))
'("message/rfc822" (charset . gnus-decoded))))
@@
-658,22
+673,34
@@
value of `mm-uu-text-plain-type'."
(goto-char text-start)
(re-search-forward "." start-point t)))
(push
(goto-char text-start)
(re-search-forward "." start-point t)))
(push
- (mm-make-handle (mm-uu-copy-to-buffer text-start start-point)
- mm-uu-text-plain-type)
+ (mm-make-handle
+ (mm-uu-copy-to-buffer
+ text-start
+ ;; A start-separator is likely accompanied by
+ ;; a leading newline.
+ (if (and (eq (char-before start-point) ?\n)
+ (eq (char-before (1- start-point)) ?\n))
+ (1- start-point)
+ start-point))
+ mm-uu-text-plain-type)
result))
(push
(funcall (mm-uu-function-extract entry))
result)
(goto-char (setq text-start end-point))))
(when result
result))
(push
(funcall (mm-uu-function-extract entry))
result)
(goto-char (setq text-start end-point))))
(when result
- (if (and (> (point-max) (1+ text-start))
- (save-excursion
- (goto-char text-start)
- (re-search-forward "." nil t)))
- (push
- (mm-make-handle (mm-uu-copy-to-buffer text-start (point-max))
- mm-uu-text-plain-type)
- result))
+ (goto-char text-start)
+ (when (re-search-forward "." nil t)
+ (push (mm-make-handle
+ (mm-uu-copy-to-buffer
+ ;; An end-separator is likely accompanied by
+ ;; a trailing newline.
+ (if (eq (char-after text-start) ?\n)
+ (1+ text-start)
+ text-start)
+ (point-max))
+ mm-uu-text-plain-type)
+ result))
(setq result (cons "multipart/mixed" (nreverse result))))
result)))
(setq result (cons "multipart/mixed" (nreverse result))))
result)))
@@
-694,6
+721,8
@@
Assume text has been decoded if DECODED is non-nil."
;; Mutt still uses application/pgp even though
;; it has already been withdrawn.
(string-match "\\`text/\\|\\`application/pgp\\'" type)
;; Mutt still uses application/pgp even though
;; it has already been withdrawn.
(string-match "\\`text/\\|\\`application/pgp\\'" type)
+ (equal (car (mm-handle-disposition handle))
+ "inline")
(setq
children
(with-current-buffer buffer
(setq
children
(with-current-buffer buffer