aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-11-14 23:45:45 -0800
committerGlenn Morris2011-11-14 23:45:45 -0800
commit672b871d9838335ac12faaf62793a811f1269a66 (patch)
tree2f83acd3b7c456281772a82f75a8fab0810293d3
parentf6aa5bb177cdc2d566026ae67e8cad54b89e92fc (diff)
downloademacs-672b871d9838335ac12faaf62793a811f1269a66.tar.gz
emacs-672b871d9838335ac12faaf62793a811f1269a66.zip
rmailmm doc fixes.
* lisp/mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-segment) (rmail-mime-shown-mode, rmail-mime-hidden-mode, rmail-mime-raw-mode) (rmail-mime-toggle-hidden, rmail-mime-insert-tagline) (rmail-mime-insert-header, rmail-mime-handle, rmail-mime-parse) (rmail-mime, rmail-show-mime): Doc fixes.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/mail/rmailmm.el57
2 files changed, 34 insertions, 29 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef99e354593..4d4f228dbdd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,12 @@
7 7
82011-11-15 Glenn Morris <rgm@gnu.org> 82011-11-15 Glenn Morris <rgm@gnu.org>
9 9
10 * mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-segment)
11 (rmail-mime-shown-mode, rmail-mime-hidden-mode, rmail-mime-raw-mode)
12 (rmail-mime-toggle-hidden, rmail-mime-insert-tagline)
13 (rmail-mime-insert-header, rmail-mime-handle, rmail-mime-parse)
14 (rmail-mime, rmail-show-mime): Doc fixes.
15
10 * term/ns-win.el (mode-line-frame-identification): 16 * term/ns-win.el (mode-line-frame-identification):
11 Leave it alone. (Bug#10051) 17 Leave it alone. (Bug#10051)
12 18
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index be38449a680..45f7fe24f26 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -155,7 +155,7 @@ MIME entities.")
155(defun rmail-mime-entity (type disposition transfer-encoding 155(defun rmail-mime-entity (type disposition transfer-encoding
156 display header tagline body children handler 156 display header tagline body children handler
157 &optional truncated) 157 &optional truncated)
158 "Retrun a newly created MIME-entity object from arguments. 158 "Return a newly created MIME-entity object from arguments.
159 159
160A MIME-entity is a vector of 10 elements: 160A MIME-entity is a vector of 10 elements:
161 161
@@ -180,16 +180,16 @@ The corresponding TYPE argument must be:
180 \(\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\")) 180 \(\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\"))
181 181
182TRANSFER-ENCODING corresponds to MIME header 182TRANSFER-ENCODING corresponds to MIME header
183Content-Transfer-Encoding, and is a lowercased string. 183Content-Transfer-Encoding, and is a lower-case string.
184 184
185DISPLAY is a vector [CURRENT NEW], where CURRENT indicates how 185DISPLAY is a vector [CURRENT NEW], where CURRENT indicates how
186the header, tagline, and body of the entity are displayed now, 186the header, tag line, and body of the entity are displayed now,
187and NEW indicates how their displaying should be updated. 187and NEW indicates how their display should be updated.
188Both elements are vector [HEADER-DISPLAY TAGLINE-DISPLAY BODY-DISPLAY], 188Both elements are vectors [HEADER-DISPLAY TAGLINE-DISPLAY BODY-DISPLAY],
189where each element is a symbol for the corresponding item that 189where each constituent element is a symbol for the corresponding
190has these values: 190item with these values:
191 nil: not displayed 191 nil: not displayed
192 t: displayed by the decoded presentation form 192 t: displayed by the decoded presentation form
193 raw: displayed by the raw MIME data (for the header and body only) 193 raw: displayed by the raw MIME data (for the header and body only)
194 194
195HEADER and BODY are vectors [BEG END DISPLAY-FLAG], where BEG and 195HEADER and BODY are vectors [BEG END DISPLAY-FLAG], where BEG and
@@ -201,11 +201,11 @@ presentation form.
201TAGLINE is a vector [TAG BULK-DATA DISPLAY-FLAG], where TAG is a 201TAGLINE is a vector [TAG BULK-DATA DISPLAY-FLAG], where TAG is a
202string indicating the depth and index number of the entity, 202string indicating the depth and index number of the entity,
203BULK-DATA is a cons (SIZE . TYPE) indicating the size and type of 203BULK-DATA is a cons (SIZE . TYPE) indicating the size and type of
204an attached data, DISPLAY-FLAG non-nil means that the tagline is, 204an attached data, DISPLAY-FLAG non-nil means that the tag line is
205by default, displayed. 205displayed by default.
206 206
207CHILDREN is a list of child MIME-entities. A \"multipart/*\" 207CHILDREN is a list of child MIME-entities. A \"multipart/*\"
208entity have one or more children. A \"message/rfc822\" entity 208entity has one or more children. A \"message/rfc822\" entity
209has just one child. Any other entity has no child. 209has just one child. Any other entity has no child.
210 210
211HANDLER is a function to insert the entity according to DISPLAY. 211HANDLER is a function to insert the entity according to DISPLAY.
@@ -284,10 +284,10 @@ TRUNCATED is non-nil if the text of this entity was truncated."
284(defun rmail-mime-entity-segment (pos &optional entity) 284(defun rmail-mime-entity-segment (pos &optional entity)
285 "Return a vector describing the displayed region of a MIME-entity at POS. 285 "Return a vector describing the displayed region of a MIME-entity at POS.
286Optional 2nd argument ENTITY is the MIME-entity at POS. 286Optional 2nd argument ENTITY is the MIME-entity at POS.
287The value is a vector [ INDEX HEADER TAGLINE BODY END], where 287The value is a vector [INDEX HEADER TAGLINE BODY END], where
288 INDEX: index into the returned vector indicating where POS is (1..3). 288 INDEX: index into the returned vector indicating where POS is (1..3)
289 HEADER: the position of the beginning of a header 289 HEADER: the position of the beginning of a header
290 TAGLINE: the position of the beginning of a tagline 290 TAGLINE: the position of the beginning of a tag line
291 BODY: the position of the beginning of a body 291 BODY: the position of the beginning of a body
292 END: the position of the end of the entity." 292 END: the position of the end of the entity."
293 (save-excursion 293 (save-excursion
@@ -331,7 +331,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
331 (vector index beg tagline-beg body-beg end))))) 331 (vector index beg tagline-beg body-beg end)))))
332 332
333(defun rmail-mime-shown-mode (entity) 333(defun rmail-mime-shown-mode (entity)
334 "Make MIME-entity ENTITY displayed by the default way." 334 "Make MIME-entity ENTITY display in the default way."
335 (let ((new (aref (rmail-mime-entity-display entity) 1))) 335 (let ((new (aref (rmail-mime-entity-display entity) 1)))
336 (aset new 0 (aref (rmail-mime-entity-header entity) 2)) 336 (aset new 0 (aref (rmail-mime-entity-header entity) 2))
337 (aset new 1 (aref (rmail-mime-entity-tagline entity) 2)) 337 (aset new 1 (aref (rmail-mime-entity-tagline entity) 2))
@@ -340,7 +340,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
340 (rmail-mime-shown-mode child))) 340 (rmail-mime-shown-mode child)))
341 341
342(defun rmail-mime-hidden-mode (entity) 342(defun rmail-mime-hidden-mode (entity)
343 "Make MIME-entity ENTITY displayed in the hidden mode." 343 "Make MIME-entity ENTITY display in hidden mode."
344 (let ((new (aref (rmail-mime-entity-display entity) 1))) 344 (let ((new (aref (rmail-mime-entity-display entity) 1)))
345 (aset new 0 nil) 345 (aset new 0 nil)
346 (aset new 1 t) 346 (aset new 1 t)
@@ -349,7 +349,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
349 (rmail-mime-hidden-mode child))) 349 (rmail-mime-hidden-mode child)))
350 350
351(defun rmail-mime-raw-mode (entity) 351(defun rmail-mime-raw-mode (entity)
352 "Make MIME-entity ENTITY displayed in the raw mode." 352 "Make MIME-entity ENTITY display in raw mode."
353 (let ((new (aref (rmail-mime-entity-display entity) 1))) 353 (let ((new (aref (rmail-mime-entity-display entity) 1)))
354 (aset new 0 'raw) 354 (aset new 0 'raw)
355 (aset new 1 nil) 355 (aset new 1 nil)
@@ -376,7 +376,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
376 (restore-buffer-modified-p modified))))) 376 (restore-buffer-modified-p modified)))))
377 377
378(defun rmail-mime-toggle-hidden () 378(defun rmail-mime-toggle-hidden ()
379 "Hide or show the body of MIME-entity at point." 379 "Hide or show the body of the MIME-entity at point."
380 (interactive) 380 (interactive)
381 (when (rmail-mime-message-p) 381 (when (rmail-mime-message-p)
382 (let* ((rmail-mime-mbox-buffer rmail-view-buffer) 382 (let* ((rmail-mime-mbox-buffer rmail-view-buffer)
@@ -424,7 +424,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
424 424
425(defun rmail-mime-insert-tagline (entity &rest item-list) 425(defun rmail-mime-insert-tagline (entity &rest item-list)
426 "Insert a tag line for MIME-entity ENTITY. 426 "Insert a tag line for MIME-entity ENTITY.
427ITEM-LIST is a list of strings or button-elements (list) to be added 427ITEM-LIST is a list of strings or button-elements (list) to add
428to the tag line." 428to the tag line."
429 (insert "\n[") 429 (insert "\n[")
430 (let ((tag (aref (rmail-mime-entity-tagline entity) 0))) 430 (let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
@@ -464,7 +464,7 @@ to the tag line."
464(defun rmail-mime-insert-header (header) 464(defun rmail-mime-insert-header (header)
465 "Decode and insert a MIME-entity header HEADER in the current buffer. 465 "Decode and insert a MIME-entity header HEADER in the current buffer.
466HEADER is a vector [BEG END DEFAULT-STATUS]. 466HEADER is a vector [BEG END DEFAULT-STATUS].
467See `rmail-mime-entity' for the detail." 467See `rmail-mime-entity' for details."
468 (let ((pos (point)) 468 (let ((pos (point))
469 (last-coding-system-used nil)) 469 (last-coding-system-used nil))
470 (save-restriction 470 (save-restriction
@@ -1011,7 +1011,7 @@ point should be at the beginning of the body.
1011 1011
1012CONTENT-TYPE, CONTENT-DISPOSITION, and CONTENT-TRANSFER-ENCODING 1012CONTENT-TYPE, CONTENT-DISPOSITION, and CONTENT-TRANSFER-ENCODING
1013are the values of the respective parsed headers. The latter should 1013are the values of the respective parsed headers. The latter should
1014be downcased. The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION 1014be lower-case. The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION
1015have the form 1015have the form
1016 1016
1017 \(VALUE . ALIST) 1017 \(VALUE . ALIST)
@@ -1196,7 +1196,7 @@ modified."
1196 1196
1197(defun rmail-mime-parse () 1197(defun rmail-mime-parse ()
1198 "Parse the current Rmail message as a MIME message. 1198 "Parse the current Rmail message as a MIME message.
1199The value is a MIME-entiy object (see `rmail-mime-entity'). 1199The value is a MIME-entity object (see `rmail-mime-entity').
1200If an error occurs, return an error message string." 1200If an error occurs, return an error message string."
1201 (let ((rmail-mime-mbox-buffer (if (rmail-buffers-swapped-p) 1201 (let ((rmail-mime-mbox-buffer (if (rmail-buffers-swapped-p)
1202 rmail-view-buffer 1202 rmail-view-buffer
@@ -1268,20 +1268,19 @@ available."
1268(defun rmail-mime (&optional arg) 1268(defun rmail-mime (&optional arg)
1269 "Toggle displaying of a MIME message. 1269 "Toggle displaying of a MIME message.
1270 1270
1271The actualy behavior depends on the value of `rmail-enable-mime'. 1271The actual behavior depends on the value of `rmail-enable-mime'.
1272 1272
1273If `rmail-enable-mime' is t (default), this command change the 1273If `rmail-enable-mime' is non-nil (default), this command changes the
1274displaying of a MIME message between decoded presentation form 1274display of a MIME message between decoded presentation form and raw data.
1275and raw data.
1276 1275
1277With ARG, toggle the displaying of the current MIME entity only. 1276With ARG, toggle the display of the current MIME entity only.
1278 1277
1279If `rmail-enable-mime' is nil, this creates a temporary 1278If `rmail-enable-mime' is nil, this creates a temporary
1280\"*RMAIL*\" buffer holding a decoded copy of the message. Inline 1279\"*RMAIL*\" buffer holding a decoded copy of the message. Inline
1281content-types are handled according to 1280content-types are handled according to
1282`rmail-mime-media-type-handlers-alist'. By default, this 1281`rmail-mime-media-type-handlers-alist'. By default, this
1283displays text and multipart messages, and offers to download 1282displays text and multipart messages, and offers to download
1284attachments as specfied by `rmail-mime-attachment-dirs-alist'." 1283attachments as specified by `rmail-mime-attachment-dirs-alist'."
1285 (interactive "P") 1284 (interactive "P")
1286 (if rmail-enable-mime 1285 (if rmail-enable-mime
1287 (with-current-buffer rmail-buffer 1286 (with-current-buffer rmail-buffer
@@ -1315,7 +1314,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
1315 (view-buffer buf)))) 1314 (view-buffer buf))))
1316 1315
1317(defun rmail-mm-get-boundary-error-message (message type disposition encoding) 1316(defun rmail-mm-get-boundary-error-message (message type disposition encoding)
1318 "Return MESSAGE with more information on the main mime components." 1317 "Return MESSAGE with more information on the main MIME components."
1319 (error "%s; type: %s; disposition: %s; encoding: %s" 1318 (error "%s; type: %s; disposition: %s; encoding: %s"
1320 message type disposition encoding)) 1319 message type disposition encoding))
1321 1320