*** dist/vm-folder.el.dist Tue Jul 21 13:07:07 1998 --- vm-folder.el Thu Jul 23 09:20:48 1998 *************** *** 488,494 **** Returns ! nil if folder has no type (empty) ! unknown if the type is not known to VM ! mmdf for MMDF folders ! babyl for BABYL folders ! From_ for UNIX From_ folders --- 488,497 ---- Returns ! nil if folder has no type (empty) ! unknown if the type is not known to VM ! mmdf for MMDF folders ! babyl for BABYL folders ! From_ for BSD UNIX From_ folders ! BellFrom_ for old SysV From_ folders ! From_-with-Content-Length ! for new SysV folders that use the Content-Length header *************** *** 497,499 **** folder has a Content-Length header and the folder otherwise looks ! like a From_ folder." (let ((temp-buffer nil) --- 500,508 ---- folder has a Content-Length header and the folder otherwise looks ! like a From_ folder. ! ! Since BellFrom_ and From_ folders cannot be reliably distinguished ! from each other, you must tell VM which one your system uses by ! setting the variable vm-default-From_-folder-type to either From_ or ! BellFrom_. For folders that could be From_ or BellFrom_ folders, ! the value of vm-default-From_folder-type will be returned." (let ((temp-buffer nil) *************** *** 527,529 **** (if (not vm-trust-From_-with-Content-Length) ! 'From_ (let ((case-fold-search t)) --- 536,538 ---- (if (not vm-trust-From_-with-Content-Length) ! vm-default-From_-folder-type (let ((case-fold-search t)) *************** *** 532,537 **** (cond ((match-beginning 1) ! 'From_) ((match-beginning 0) 'From_-with-Content-Length) ! (t 'From_)))) ((looking-at "\001\001\001\001\n") 'mmdf) --- 541,546 ---- (cond ((match-beginning 1) ! vm-default-From_-folder-type) ((match-beginning 0) 'From_-with-Content-Length) ! (t vm-default-From_-folder-type)))) ((looking-at "\001\001\001\001\n") 'mmdf) *************** *** 645,648 **** (save-excursion (let ((vm-folder-type folder-type)) ! (cond ((memq folder-type '(From_ From_-with-Content-Length mmdf babyl)) (setq end (vm-marker end)) --- 654,664 ---- (save-excursion + ;; when munging From-type separators it is best to use the + ;; least forgiving of the folder types, so that we don't + ;; create folders that other mailers or older versions of VM + ;; will misparse. + (if (eq folder-type 'From_) + (setq folder-type 'BellFrom_)) (let ((vm-folder-type folder-type)) ! (cond ((memq folder-type '(From_ From_-with-Content-Length mmdf ! BellFrom_ babyl)) (setq end (vm-marker end)) *************** *** 681,683 **** (let ((type (or folder-type vm-folder-type))) ! (cond ((memq type '(From_ From_-with-Content-Length)) (concat "From VM " (current-time-string) "\n")) --- 697,699 ---- (let ((type (or folder-type vm-folder-type))) ! (cond ((memq type '(From_ From_-with-Content-Length BellFrom_)) (concat "From VM " (current-time-string) "\n")) *************** *** 701,702 **** --- 717,719 ---- ((eq type 'From_-with-Content-Length) "") + ((eq type 'BellFrom_) "") ((eq type 'mmdf) "\001\001\001\001\n") *************** *** 733,735 **** (let ((reg1 "^From .* [1-9][0-9][0-9][0-9]$") - (reg2 "^>From ") (case-fold-search nil)) --- 750,751 ---- *************** *** 738,741 **** (goto-char (match-beginning 0)) ! (if (and (or (< (point) 3) ! (equal (char-after (- (point) 2)) ?\n))) (throw 'done t) --- 754,757 ---- (goto-char (match-beginning 0)) ! (if (or (< (point) 3) ! (equal (char-after (- (point) 2)) ?\n)) (throw 'done t) *************** *** 743,744 **** --- 759,768 ---- nil ))) + ((eq vm-folder-type 'BellFrom_) + (let ((reg1 "^From .* [1-9][0-9][0-9][0-9]$") + (case-fold-search nil)) + (if (re-search-forward reg1 nil 'no-error) + (progn + (goto-char (match-beginning 0)) + t ) + nil ))) ((eq vm-folder-type 'From_-with-Content-Length) *************** *** 774,775 **** --- 798,801 ---- (forward-char -1)) + ((eq vm-folder-type 'BellFrom_) + (vm-find-leading-message-separator)) ((eq vm-folder-type 'From_-with-Content-Length) *************** *** 811,813 **** (cond ! ((memq vm-folder-type '(From_ From_-with-Content-Length)) (let ((reg1 "^>From ") --- 837,839 ---- (cond ! ((memq vm-folder-type '(From_ BellFrom_ From_-with-Content-Length)) (let ((reg1 "^>From ") *************** *** 836,837 **** --- 862,864 ---- ((eq vm-folder-type 'From_-with-Content-Length)) + ((eq vm-folder-type 'BellFrom_)) ((eq vm-folder-type 'mmdf) *************** *** 885,887 **** ;; do more than whine. ! (if (and (memq vm-folder-type '(From_ From_-with-Content-Length)) (= (following-char) ?\n)) --- 912,915 ---- ;; do more than whine. ! (if (and (memq vm-folder-type '(From_ BellFrom_ ! From_-with-Content-Length)) (= (following-char) ?\n)) *************** *** 3838,3839 **** --- 3866,3868 ---- From_-with-Content-Length + BellFrom_ mmdf *************** *** 3855,3857 **** (vm-error-if-folder-empty) ! (if (not (memq type '(From_ From_-with-Content-Length mmdf babyl))) (error "Unknown folder type: %s" type)) --- 3884,3886 ---- (vm-error-if-folder-empty) ! (if (not (memq type '(From_ BellFrom_ From_-with-Content-Length mmdf babyl))) (error "Unknown folder type: %s" type)) *** dist/vm-mime.el.dist Tue Jul 21 21:18:01 1998 --- vm-mime.el Wed Jul 22 12:14:31 1998 *************** *** 1601,1603 **** (cond ((and (vm-mime-can-display-internal (car part-list)) ! (vm-mime-should-display-internal (car part-list))) (setq best (car part-list) --- 1601,1604 ---- (cond ((and (vm-mime-can-display-internal (car part-list)) ! (vm-mime-should-display-internal (car part-list) ! nil)) (setq best (car part-list) *** dist/vm-reply.el.dist Tue Jul 21 13:07:11 1998 --- vm-reply.el Wed Jul 22 14:49:55 1998 *************** *** 1406,1410 **** (goto-char (point-min)) ! (insert (vm-leading-message-separator 'From_)) (goto-char (point-max)) ! (insert (vm-trailing-message-separator 'From_)) (set-buffer-modified-p nil) --- 1406,1410 ---- (goto-char (point-min)) ! (insert (vm-leading-message-separator vm-default-From_-folder-type)) (goto-char (point-max)) ! (insert (vm-trailing-message-separator vm-default-From_-folder-type)) (set-buffer-modified-p nil) *** dist/vm-startup.el.dist Tue Jul 21 21:18:04 1998 --- vm-startup.el Fri Jul 24 09:43:38 1998 *************** *** 295,297 **** ! This is VM 6.58. --- 295,297 ---- ! This is VM 6.59. *************** *** 443,444 **** --- 443,445 ---- vm-crash-box-suffix + vm-default-From_-folder-type vm-default-folder-type *************** *** 932,933 **** --- 933,935 ---- 'vm-crash-box-suffix + 'vm-default-From_-folder-type 'vm-default-folder-type *** dist/vm-summary.el.dist Mon Jul 13 11:05:14 1998 --- vm-summary.el Wed Jul 22 14:49:55 1998 *************** *** 669,671 **** (if (not (memq (vm-message-type-of message) ! '(From_ From_-with-Content-Length))) nil --- 669,671 ---- (if (not (memq (vm-message-type-of message) ! '(BellFrom_ From_ From_-with-Content-Length))) nil *************** *** 838,840 **** (if (not (memq (vm-message-type-of message) ! '(From_ From_-with-Content-Length))) nil --- 838,840 ---- (if (not (memq (vm-message-type-of message) ! '(From_ BellFrom_ From_-with-Content-Length))) nil *** dist/vm-vars.el.dist Tue Jul 21 13:07:14 1998 --- vm-vars.el Fri Jul 24 09:32:01 1998 *************** *** 24,26 **** (defvar vm-preferences-file "~/.vm.preferences" ! "*Secondary startup file for VM, loaded after vm-init-file. This file is written and overwritten by VM and is not meant for --- 24,26 ---- (defvar vm-preferences-file "~/.vm.preferences" ! "*Secondary startup file for VM, loaded after `vm-init-file'. This file is written and overwritten by VM and is not meant for *************** *** 46,48 **** incoming mail. This is an exceedingly rare problem, but if you ! want to avoid losing mail if it happens, set vm-keep-crash-boxes to point to a directory in the same filesystem as all your --- 46,48 ---- incoming mail. This is an exceedingly rare problem, but if you ! want to avoid losing mail if it happens, set `vm-keep-crash-boxes' to point to a directory in the same filesystem as all your *************** *** 88,91 **** VM thinks your system mailbox is. Mail will be moved from these ! mailboxes to your primary inbox as specified by vm-primary-inbox, ! using vm-crash-box as a waystation. --- 88,91 ---- VM thinks your system mailbox is. Mail will be moved from these ! mailboxes to your primary inbox as specified by `vm-primary-inbox', ! using `vm-crash-box' as a waystation. *************** *** 98,100 **** INBOX is the folder where you want your new mail to be moved when ! you type 'g' (running vm-get-new-mail) in VM. It is where you will read the mail. --- 98,100 ---- INBOX is the folder where you want your new mail to be moved when ! you type 'g' (running `vm-get-new-mail') in VM. It is where you will read the mail. *************** *** 134,136 **** the server with the APOP command. In order to use \"apop\" you ! will have to set the value of vm-pop-md5-program appropriately to point at the program that will generate the MD5 digest that VM --- 134,136 ---- the server with the APOP command. In order to use \"apop\" you ! will have to set the value of `vm-pop-md5-program' appropriately to point at the program that will generate the MD5 digest that VM *************** *** 181,185 **** ! vm-spool-files will default to the value of the shell environmental variables MAILPATH or MAIL if either of these ! variables are defined and no particular value for vm-spool-files has been specified.") --- 181,185 ---- ! `vm-spool-files' will default to the value of the shell environmental variables MAILPATH or MAIL if either of these ! variables are defined and no particular value for `vm-spool-files' has been specified.") *************** *** 195,200 **** ~/mail/beekeeping.spool and ~/mail/beekeeping- in addition to ! scanning vm-spool-files for matches. ! The value of vm-spool-files-suffixes will not be used unless ! vm-crash-box-suffix is also defined, since a crash box is required for all mail retrieval from spool files.") --- 195,200 ---- ~/mail/beekeeping.spool and ~/mail/beekeeping- in addition to ! scanning `vm-spool-files' for matches. ! The value of `vm-spool-files-suffixes' will not be used unless ! `vm-crash-box-suffix' is also defined, since a crash box is required for all mail retrieval from spool files.") *************** *** 203,206 **** "*String suffix used to create possible crash box file names for folders. ! When VM uses vm-spool-file-suffixes to create a spool file name, ! it will append the value of vm-crash-box-suffix to the folder's file name to create a crash box name.") --- 203,206 ---- "*String suffix used to create possible crash box file names for folders. ! When VM uses `vm-spool-file-suffixes' to create a spool file name, ! it will append the value of `vm-crash-box-suffix' to the folder's file name to create a crash box name.") *************** *** 227,229 **** ! If VM is retrieving mail automatically because vm-auto-get-new-mail is set to a numeric value then you will not be prompted about large messages. --- 227,229 ---- ! If VM is retrieving mail automatically because `vm-auto-get-new-mail' is set to a numeric value then you will not be prompted about large messages. *************** *** 233,235 **** ! A nil value for vm-pop-max-message-size means no size limit.") --- 233,235 ---- ! A nil value for `vm-pop-max-message-size' means no size limit.") *************** *** 255,257 **** after retrieving them. A nil value means messages will be left ! in the POP mailbox until you run vm-expunge-pop-messages. --- 255,257 ---- after retrieving them. A nil value means messages will be left ! in the POP mailbox until you run `vm-expunge-pop-messages'. *************** *** 268,274 **** MAILBOX should be a pop mailbox specification as described in ! the documentation for the variable vm-spool-files. If you have ! the POP password specified in the vm-spool-files entry, you do not have to specify it here as well. Use `*' instead; VM will still understand that this mailbox is the same as the one in ! vm-spool-files that gives the password. --- 268,274 ---- MAILBOX should be a pop mailbox specification as described in ! the documentation for the variable `vm-spool-files'. If you have ! the POP password specified in the `vm-spool-files' entry, you do not have to specify it here as well. Use `*' instead; VM will still understand that this mailbox is the same as the one in ! `vm-spool-files' that gives the password. *************** *** 280,282 **** "*Value if non-nil should be a regular expression that matches ! spool names found in vm-spool-files that should be considered POP maildrops. A nil value tells VM that all the spool names are to --- 280,282 ---- "*Value if non-nil should be a regular expression that matches ! spool names found in `vm-spool-files' that should be considered POP maildrops. A nil value tells VM that all the spool names are to *************** *** 288,290 **** ! If VM is retrieving mail automatically because vm-auto-get-new-mail is set to a numeric value then you will not be prompted about large messages. --- 288,290 ---- ! If VM is retrieving mail automatically because `vm-auto-get-new-mail' is set to a numeric value then you will not be prompted about large messages. *************** *** 294,296 **** ! A nil value for vm-imap-max-message-size means no size limit.") --- 294,296 ---- ! A nil value for `vm-imap-max-message-size' means no size limit.") *************** *** 316,318 **** after retrieving them. A nil value means messages will be left ! in the IMAP mailbox until you run vm-expunge-imap-messages. --- 316,318 ---- after retrieving them. A nil value means messages will be left ! in the IMAP mailbox until you run `vm-expunge-imap-messages'. *************** *** 341,343 **** "*Value if non-nil should be a regular expression that matches ! spool names found in vm-spool-files that should be considered IMAP maildrops. A nil value tells VM that all the spool names are to --- 341,343 ---- "*Value if non-nil should be a regular expression that matches ! spool names found in `vm-spool-files' that should be considered IMAP maildrops. A nil value tells VM that all the spool names are to *************** *** 348,350 **** to a mail folder when the folder is first visited. Nil means ! you must always use vm-get-new-mail to pull in newly arrived messages. --- 348,350 ---- to a mail folder when the folder is first visited. Nil means ! you must always use `vm-get-new-mail' to pull in newly arrived messages. *************** *** 363,365 **** Note that mail if new mail is found, it is not retrieved. The ! buffer local variable vm-spooled-mail-waiting is set non-nil in the buffers of those folders that have mail waiting. VM uses --- 363,365 ---- Note that mail if new mail is found, it is not retrieved. The ! buffer local variable `vm-spooled-mail-waiting' is set non-nil in the buffers of those folders that have mail waiting. VM uses *************** *** 391,392 **** --- 391,393 ---- From_-with-Content-Length + BellFrom_ mmdf *************** *** 401,403 **** If you set this variable's value to From_-with-Content-Length you ! must set vm-trust-From_-with-Content-Length non-nil.") --- 402,421 ---- If you set this variable's value to From_-with-Content-Length you ! must set `vm-trust-From_-with-Content-Length' non-nil.") ! ! (defvar vm-default-From_-folder-type 'From_ ! "*Value must be a symbol that tells VM which From-style folder type ! is used by your local mail delivery system. Valid values are ! ! From_ ! BellFrom_ ! ! Messages in From_ folders are separated by the two newlines ! followed by the string \"From\" and a space. Messages in ! BellFrom_ folders are only required to have a single newline ! before the \"From\" string. ! ! Since BellFrom_ and From_ folders cannot be reliably distinguished ! from each other, you must tell VM which one your system uses by ! setting the variable `vm-default-From_-folder-type' to either From_ ! or BellFrom_.") *************** *** 417,419 **** type before saving or incorporating them, or it will signal an ! error. The value of vm-convert-folder-types determines which action VM will take.") --- 435,437 ---- type before saving or incorporating them, or it will signal an ! error. The value of `vm-convert-folder-types' determines which action VM will take.") *************** *** 422,427 **** "*Non-nil value means that when VM checks folder types and finds ! a mismatch (see vm-check-folder-types), it will convert the source messages to the type of the destination folder, if it can. ! If vm-check-folder-types is nil, then this variable isn't consulted.") --- 440,445 ---- "*Non-nil value means that when VM checks folder types and finds ! a mismatch (see `vm-check-folder-types'), it will convert the source messages to the type of the destination folder, if it can. ! If `vm-check-folder-types' is nil, then this variable isn't consulted.") *************** *** 438,440 **** ! If you set vm-default-folder-type to From_-with-Content-Length you must set this variable non-nil.") --- 456,458 ---- ! If you set `vm-default-folder-type' to From_-with-Content-Length you must set this variable non-nil.") *************** *** 455,462 **** ! If the value of vm-invisible-header-regexp is nil, only the ! headers matched by vm-visible-headers will be displayed. Otherwise all headers are displayed except those matched by ! vm-invisible-header-regexp. In this case vm-visible-headers specifies the order in which headers are displayed. Headers not ! matching vm-visible-headers are display last.") --- 473,480 ---- ! If the value of `vm-invisible-header-regexp' is nil, only the ! headers matched by `vm-visible-headers' will be displayed. Otherwise all headers are displayed except those matched by ! `vm-invisible-header-regexp'. In this case `vm-visible-headers' specifies the order in which headers are displayed. Headers not ! matching `vm-visible-headers' are display last.") *************** *** 465,472 **** VM should NOT normally display when presenting a message. All other ! headers will be displayed. The variable vm-visible-headers specifies the presentation order of headers; headers not matched by ! vm-visible-headers are displayed last. Nil value causes VM to display ONLY those headers specified in ! vm-visible-headers.") --- 483,490 ---- VM should NOT normally display when presenting a message. All other ! headers will be displayed. The variable `vm-visible-headers' specifies the presentation order of headers; headers not matched by ! `vm-visible-headers' are displayed last. Nil value causes VM to display ONLY those headers specified in ! `vm-visible-headers'.") *************** *** 483,487 **** `highlight-headers' package instead. If so, then you should set ! the variable vm-use-lucid-highlighting non-nil. You'll need to set the various variables used by the highlight-headers package ! to customize highlighting. vm-highlighted-header-regexp is ignored in this case.") --- 501,505 ---- `highlight-headers' package instead. If so, then you should set ! the variable `vm-use-lucid-highlighting' non-nil. You'll need to set the various variables used by the highlight-headers package ! to customize highlighting. `vm-highlighted-header-regexp' is ignored in this case.") *************** *** 498,503 **** "*Face to be used to highlight headers. ! The headers to highlight are specified by the vm-highlighted-header-regexp variable. ! This variable is ignored under XEmacs if vm-use-lucid-highlighting is nil. XEmacs' highlight-headers package is used instead. See the --- 516,521 ---- "*Face to be used to highlight headers. ! The headers to highlight are specified by the `vm-highlighted-header-regexp' variable. ! This variable is ignored under XEmacs if `vm-use-lucid-highlighting' is nil. XEmacs' highlight-headers package is used instead. See the *************** *** 543,545 **** VM to believe that it cannot display a message that it actually ! can display. You can set vm-mime-ignore-mime-version non-nil if you use such systems.") --- 561,563 ---- VM to believe that it cannot display a message that it actually ! can display. You can set `vm-mime-ignore-mime-version' non-nil if you use such systems.") *************** *** 659,661 **** If VM cannot display a type internally or has been instructed not ! to (see the documentation for the vm-mime-internal-content-types variable) it will try to launch an external program to display that --- 677,679 ---- If VM cannot display a type internally or has been instructed not ! to (see the documentation for the `vm-mime-internal-content-types' variable) it will try to launch an external program to display that *************** *** 695,697 **** them expanded as described in the documentation for the ! variable vm-mime-button-format-alist. The only difference is that %f refers to the temporary file VM creates to store --- 713,715 ---- them expanded as described in the documentation for the ! variable `vm-mime-button-format-alist'. The only difference is that %f refers to the temporary file VM creates to store *************** *** 761,763 **** of Emacs) and is allowed to be displayed internally (see ! vm-mime-internal-content-types). If none of the parts can be displayed internally, behavior reverts to that of 'best.") --- 779,781 ---- of Emacs) and is allowed to be displayed internally (see ! `vm-mime-internal-content-types'). If none of the parts can be displayed internally, behavior reverts to that of 'best.") *************** *** 935,937 **** ! If vm-mime-composition-armor-from-lines is non-nil, a line beginning with \"From \" will cause VM to encode the message --- 953,955 ---- ! If `vm-mime-composition-armor-from-lines' is non-nil, a line beginning with \"From \" will cause VM to encode the message *************** *** 997,999 **** ! If you see one of these, setting vm-mime-avoid-folding-content-type non-nil may let your mail get through.") --- 1015,1017 ---- ! If you see one of these, setting `vm-mime-avoid-folding-content-type' non-nil may let your mail get through.") *************** *** 1007,1009 **** "*List of command line flags passed to the command named by ! vm-mime-base64-decoder-program.") --- 1025,1027 ---- "*List of command line flags passed to the command named by ! `vm-mime-base64-decoder-program'.") *************** *** 1016,1018 **** "*List of command line flags passed to the command named by ! vm-mime-base64-encoder-program.") --- 1034,1036 ---- "*List of command line flags passed to the command named by ! `vm-mime-base64-encoder-program'.") *************** *** 1026,1031 **** "*List of command line flags passed to the command named by ! vm-mime-uuencode-decoder-program.") (defvar vm-auto-next-message t ! "*Non-nil value causes VM to use vm-next-message to advance to the next message in the folder if the user attempts to scroll past the end of the --- 1044,1049 ---- "*List of command line flags passed to the command named by ! `vm-mime-uuencode-decoder-program'.") (defvar vm-auto-next-message t ! "*Non-nil value causes VM to use `vm-next-message' to advance to the next message in the folder if the user attempts to scroll past the end of the *************** *** 1078,1080 **** If you want to completely turn off VM's window configuration ! feature, set this variable and vm-window-configuration-file to nil in your .vm file. --- 1096,1098 ---- If you want to completely turn off VM's window configuration ! feature, set this variable and `vm-window-configuration-file' to nil in your .vm file. *************** *** 1083,1086 **** this, you should not set this variable directly. Rather you ! should set the variable vm-window-configuration-file to point at ! a file, and use the command vm-save-window-configuration (normally bound to `WS') to modify part of this configuration to --- 1101,1104 ---- this, you should not set this variable directly. Rather you ! should set the variable `vm-window-configuration-file' to point at ! a file, and use the command `vm-save-window-configuration' (normally bound to `WS') to modify part of this configuration to *************** *** 1088,1090 **** ! WARNING: Don't point vm-window-configuration-file at your .vm or .emacs file. Your window configuration file should start out as --- 1106,1108 ---- ! WARNING: Don't point `vm-window-configuration-file' at your .vm or .emacs file. Your window configuration file should start out as *************** *** 1101,1104 **** ! The commands vm-save-window-configuration (normally bound to `WS') and ! vm-delete-window-configuration (bound to `WD') let you update this information; see their documentation for more information. --- 1119,1122 ---- ! The commands `vm-save-window-configuration' (normally bound to `WS') and ! `vm-delete-window-configuration' (bound to `WD') let you update this information; see their documentation for more information. *************** *** 1106,1112 **** You cannot change your window configuration setup without giving ! vm-window-configuration-file a non-nil value. A nil value causes VM to use the default window setup specified by the value of ! vm-default-window-configuration. ! WARNING: Don't point vm-window-configuration-file at your .vm or .emacs file. Your window configuration file should start out as --- 1124,1130 ---- You cannot change your window configuration setup without giving ! `vm-window-configuration-file' a non-nil value. A nil value causes VM to use the default window setup specified by the value of ! `vm-default-window-configuration'. ! WARNING: Don't point `vm-window-configuration-file' at your .vm or .emacs file. Your window configuration file should start out as *************** *** 1128,1130 **** (defvar vm-confirm-new-folders nil ! "*Non-nil value causes interactive calls to vm-save-message to ask for confirmation before creating a new folder.") --- 1146,1148 ---- (defvar vm-confirm-new-folders nil ! "*Non-nil value causes interactive calls to `vm-save-message' to ask for confirmation before creating a new folder.") *************** *** 1151,1153 **** ! Setting vm-flush-interval to a numeric value will cause the VM's internal memory caches to be periodically flushed to the folder --- 1169,1171 ---- ! Setting `vm-flush-interval' to a numeric value will cause the VM's internal memory caches to be periodically flushed to the folder *************** *** 1191,1194 **** pathname, then it will be rooted in the directory named by ! vm-folder-directory, or the default-directory of the currently ! visited folder if vm-folder-directory is nil. --- 1209,1212 ---- pathname, then it will be rooted in the directory named by ! `vm-folder-directory', or the default-directory of the currently ! visited folder if `vm-folder-directory' is nil. *************** *** 1204,1206 **** Whether REGEXP is matched case sensitively depends on the value ! of the variable vm-auto-folder-case-fold-search. Header names are always matched case insensitively.") --- 1222,1224 ---- Whether REGEXP is matched case sensitively depends on the value ! of the variable `vm-auto-folder-case-fold-search'. Header names are always matched case insensitively.") *************** *** 1210,1212 **** contents while doing automatic folder selection via the variable ! vm-auto-folder-alist.") --- 1228,1230 ---- contents while doing automatic folder selection via the variable ! `vm-auto-folder-alist'.") *************** *** 1258,1260 **** forwarded - matches message if it has been forwarded using ! a variant of vm-forward-message or vm-send-digest. header - matches message if ARG matches any part of the header --- 1276,1278 ---- forwarded - matches message if it has been forwarded using ! a variant of `vm-forward-message' or `vm-send-digest'. header - matches message if ARG matches any part of the header *************** *** 1274,1276 **** lines. ARG should be a number. ! marked - matches message if it is marked, as with vm-mark-message. new - matches message if it is new. --- 1292,1294 ---- lines. ARG should be a number. ! marked - matches message if it is marked, as with `vm-mark-message'. new - matches message if it is new. *************** *** 1291,1293 **** redistributed - matches message if it has been redistributed using ! vm-resend-message. replied - matches message if it has been replied to. --- 1309,1311 ---- redistributed - matches message if it has been redistributed using ! `vm-resend-message'. replied - matches message if it has been replied to. *************** *** 1321,1323 **** unforwarded - matches message if it has not been forwarded using ! vm-forward-message or vm-send-digest or one of their variants. --- 1339,1341 ---- unforwarded - matches message if it has not been forwarded using ! `vm-forward-message' or `vm-send-digest' or one of their variants. *************** *** 1327,1329 **** unredistributed - matches message if it has not been redistributed using ! vm-resend-message. unreplied - matches message if it has not been replied to. --- 1345,1347 ---- unredistributed - matches message if it has not been redistributed using ! `vm-resend-message'. unreplied - matches message if it has not been replied to. *************** *** 1348,1350 **** set this variable directly, rather you should use the command ! vm-toggle-virtual-mirror, normally bound to `V M'.") (make-variable-buffer-local 'vm-virtual-mirror) --- 1366,1368 ---- set this variable directly, rather you should use the command ! `vm-toggle-virtual-mirror', normally bound to `V M'.") (make-variable-buffer-local 'vm-virtual-mirror) *************** *** 1362,1364 **** set this variable directly, rather you should use the command ! vm-toggle-read-only, normally bound to C-x C-q.") (make-variable-buffer-local 'vm-folder-read-only) --- 1380,1382 ---- set this variable directly, rather you should use the command ! `vm-toggle-read-only', normally bound to C-x C-q.") (make-variable-buffer-local 'vm-folder-read-only) *************** *** 1371,1373 **** `Keep' means that VM will not kill the VM mail buffer after you send a message ! with C-c C-c (vm-mail-send-and-exit). A value of 0 or nil causes VM never to keep such buffers. A value of t causes VM never to kill such buffers. --- 1389,1391 ---- `Keep' means that VM will not kill the VM mail buffer after you send a message ! with C-c C-c (`vm-mail-send-and-exit'). A value of 0 or nil causes VM never to keep such buffers. A value of t causes VM never to kill such buffers. *************** *** 1379,1381 **** "*Non-nil means ask before sending a mail message. ! This affects vm-mail-send and vm-mail-send-and-exit in Mail mode.") --- 1397,1399 ---- "*Non-nil means ask before sending a mail message. ! This affects `vm-mail-send' and `vm-mail-send-and-exit' in Mail mode.") *************** *** 1386,1388 **** format of the Resent-From header, when resending a message with ! vm-resend-message.") --- 1404,1406 ---- format of the Resent-From header, when resending a message with ! `vm-resend-message'.") *************** *** 1443,1445 **** header that is generated for replies. See the documentation for the ! variable vm-summary-format for information on what this string may contain. The format should *not* end with a newline. --- 1461,1463 ---- header that is generated for replies. See the documentation for the ! variable `vm-summary-format' for information on what this string may contain. The format should *not* end with a newline. *************** *** 1450,1452 **** included text from a message in a reply. See the documentation for the ! variable vm-summary-format for information on what this string may contain. Nil means don't attribute included text in replies.") --- 1468,1470 ---- included text from a message in a reply. See the documentation for the ! variable `vm-summary-format' for information on what this string may contain. Nil means don't attribute included text in replies.") *************** *** 1463,1473 **** ! If the value of vm-included-text-discard-header-regexp is nil, ! the headers matched by vm-included-text-headers are the only headers that will be retained. ! If vm-included-text-discard-header-regexp is non-nil, then only headers matched by that variable will be omitted; all others will ! be included. vm-included-text-headers determines the header order in that case, with headers not matching any in the ! vm-included-text-headers list appearing last in the header section of the included text.") --- 1481,1491 ---- ! If the value of `vm-included-text-discard-header-regexp' is nil, ! the headers matched by `vm-included-text-headers' are the only headers that will be retained. ! If `vm-included-text-discard-header-regexp' is non-nil, then only headers matched by that variable will be omitted; all others will ! be included. `vm-included-text-headers' determines the header order in that case, with headers not matching any in the ! `vm-included-text-headers' list appearing last in the header section of the included text.") *************** *** 1477,1490 **** what headers should not be retained in a message included in a ! reply. This variable along with vm-included-text-headers determines which headers are retained. ! If the value of vm-included-text-discard-header-regexp is nil, ! the headers matched by vm-included-text-headers are the only headers that will be retained. ! If vm-included-text-discard-header-regexp is non-nil, then only headers matched by this variable will not be retained; all ! others will be included. vm-included-text-headers determines the header order in that case, with headers not matching any in ! the vm-included-text-headers list appearing last in the header section of the included text.") --- 1495,1508 ---- what headers should not be retained in a message included in a ! reply. This variable along with `vm-included-text-headers' determines which headers are retained. ! If the value of `vm-included-text-discard-header-regexp' is nil, ! the headers matched by `vm-included-text-headers' are the only headers that will be retained. ! If `vm-included-text-discard-header-regexp' is non-nil, then only headers matched by this variable will not be retained; all ! others will be included. `vm-included-text-headers' determines the header order in that case, with headers not matching any in ! the `vm-included-text-headers' list appearing last in the header section of the included text.") *************** *** 1494,1496 **** header that is generated for a forwarded message. See the documentation ! for the variable vm-summary-format for information on what this string may contain. The format should *not* end with nor contain a newline. --- 1512,1514 ---- header that is generated for a forwarded message. See the documentation ! for the variable `vm-summary-format' for information on what this string may contain. The format should *not* end with nor contain a newline. *************** *** 1499,1501 **** (defvar vm-forwarded-headers nil ! "*List of headers that should be forwarded by vm-forward-message. These should be listed in the order you wish them to appear in --- 1517,1519 ---- (defvar vm-forwarded-headers nil ! "*List of headers that should be forwarded by `vm-forward-message'. These should be listed in the order you wish them to appear in *************** *** 1508,1518 **** ! If the value of vm-unforwarded-header-regexp is nil, the headers ! matched by vm-forwarded-headers are the only headers that will be forwarded. ! If vm-unforwarded-header-regexp is non-nil, then only headers matched by that variable will be omitted; all others will be ! forwarded. vm-forwarded-headers determines the forwarding order in that case, with headers not matching any in the ! vm-forwarded-headers list appearing last in the header section of the forwarded message.") --- 1526,1536 ---- ! If the value of `vm-unforwarded-header-regexp' is nil, the headers ! matched by `vm-forwarded-headers' are the only headers that will be forwarded. ! If `vm-unforwarded-header-regexp' is non-nil, then only headers matched by that variable will be omitted; all others will be ! forwarded. `vm-forwarded-headers' determines the forwarding order in that case, with headers not matching any in the ! `vm-forwarded-headers' list appearing last in the header section of the forwarded message.") *************** *** 1521,1535 **** "*Non-nil value should be a regular expression header that tells ! what headers should not be forwarded by vm-forward-message. This ! variable along with vm-forwarded-headers determines which headers are forwarded. ! If the value of vm-unforwarded-header-regexp is nil, the headers ! matched by vm-forwarded-headers are the only headers that will be forwarded. ! If vm-unforwarded-header-regexp is non-nil, then only headers matched by this variable will not be forwarded; all others will ! be forwarded. vm-forwarded-headers determines the forwarding order in that case, with headers not matching any in the ! vm-forwarded-headers list appearing last in the header section of the forwarded message.") --- 1539,1553 ---- "*Non-nil value should be a regular expression header that tells ! what headers should not be forwarded by `vm-forward-message'. This ! variable along with `vm-forwarded-headers' determines which headers are forwarded. ! If the value of `vm-unforwarded-header-regexp' is nil, the headers ! matched by `vm-forwarded-headers' are the only headers that will be forwarded. ! If `vm-unforwarded-header-regexp' is non-nil, then only headers matched by this variable will not be forwarded; all others will ! be forwarded. `vm-forwarded-headers' determines the forwarding order in that case, with headers not matching any in the ! `vm-forwarded-headers' list appearing last in the header section of the forwarded message.") *************** *** 1551,1553 **** "*Non-nil values means messages from a digest inherit the digest's labels. ! Labels are added to messages with vm-add-message-labels, normally bound to `l a'.") --- 1569,1571 ---- "*Non-nil values means messages from a digest inherit the digest's labels. ! Labels are added to messages with `vm-add-message-labels', normally bound to `l a'.") *************** *** 1556,1560 **** "*String which specifies the format of the preamble lines generated by ! vm-send-digest when it is invoked with a prefix argument. One line will be generated for each message put into the digest. See the ! documentation for the variable vm-summary-format for information on what this string may contain. The format should *not* end --- 1574,1578 ---- "*String which specifies the format of the preamble lines generated by ! `vm-send-digest' when it is invoked with a prefix argument. One line will be generated for each message put into the digest. See the ! documentation for the variable `vm-summary-format' for information on what this string may contain. The format should *not* end *************** *** 1569,1571 **** "*Header to insert into messages burst from a digest. ! Value should be a format string of the same type as vm-summary-format that describes a header to be inserted into each message burst from a --- 1587,1589 ---- "*Header to insert into messages burst from a digest. ! Value should be a format string of the same type as `vm-summary-format' that describes a header to be inserted into each message burst from a *************** *** 1574,1576 **** (defvar vm-digest-burst-type "guess" ! "*Value specifies the default digest type offered by vm-burst-digest when it asks you what type of digest you want to unpack. Allowed --- 1592,1594 ---- (defvar vm-digest-burst-type "guess" ! "*Value specifies the default digest type offered by `vm-burst-digest' when it asks you what type of digest you want to unpack. Allowed *************** *** 1596,1598 **** If the value is \"guess\", and you take the default ! response when vm-burst-digest queries you, VM will try to guess the digest type.") --- 1614,1616 ---- If the value is \"guess\", and you take the default ! response when `vm-burst-digest' queries you, VM will try to guess the digest type.") *************** *** 1600,1602 **** (defvar vm-digest-send-type "mime" ! "*String that specifies the type of digest vm-send-digest will use. Legal values of this variable are: --- 1618,1620 ---- (defvar vm-digest-send-type "mime" ! "*String that specifies the type of digest `vm-send-digest' will use. Legal values of this variable are: *************** *** 1626,1636 **** ! If the value of vm-rfc934-digest-discard-header-regexp is nil, the headers ! matched by vm-rfc934-digest-headers are the only headers that will be kept. ! If vm-rfc934-digest-discard-header-regexp is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. vm-rfc934-digest-headers determines the order of appearance in that case, with headers not matching any in the ! vm-rfc934-digest-headers list appearing last in the headers of the digestified messages.") --- 1644,1654 ---- ! If the value of `vm-rfc934-digest-discard-header-regexp' is nil, the headers ! matched by `vm-rfc934-digest-headers' are the only headers that will be kept. ! If `vm-rfc934-digest-discard-header-regexp' is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. `vm-rfc934-digest-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-rfc934-digest-headers' list appearing last in the headers of the digestified messages.") *************** *** 1640,1653 **** what headers should not appear in RFC 934 digests created by VM. This ! variable along with vm-rfc934-digest-headers determines which headers are kept and which are discarded. ! If the value of vm-rfc934-digest-discard-header-regexp is nil, the headers ! matched by vm-rfc934-digest-headers are the only headers that will be kept. ! If vm-rfc934-digest-discard-header-regexp is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. vm-rfc934-digest-headers determines the order of appearance in that case, with headers not matching any in the ! vm-rfc934-digest-headers list appearing last in the headers of the digestified messages.") --- 1658,1671 ---- what headers should not appear in RFC 934 digests created by VM. This ! variable along with `vm-rfc934-digest-headers' determines which headers are kept and which are discarded. ! If the value of `vm-rfc934-digest-discard-header-regexp' is nil, the headers ! matched by `vm-rfc934-digest-headers' are the only headers that will be kept. ! If `vm-rfc934-digest-discard-header-regexp' is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. `vm-rfc934-digest-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-rfc934-digest-headers' list appearing last in the headers of the digestified messages.") *************** *** 1671,1681 **** ! If the value of vm-rfc1153-digest-discard-header-regexp is nil, the headers ! matched by vm-rfc1153-digest-headers are the only headers that will be kept. ! If vm-rfc1153-digest-discard-header-regexp is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. vm-rfc1153-digest-headers determines the order of appearance in that case, with headers not matching any in the ! vm-rfc1153-digest-headers list appearing last in the headers of the digestified messages.") --- 1689,1699 ---- ! If the value of `vm-rfc1153-digest-discard-header-regexp' is nil, the headers ! matched by `vm-rfc1153-digest-headers' are the only headers that will be kept. ! If `vm-rfc1153-digest-discard-header-regexp' is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. `vm-rfc1153-digest-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-rfc1153-digest-headers' list appearing last in the headers of the digestified messages.") *************** *** 1685,1698 **** what headers should not appear in RFC 1153 digests created by VM. This ! variable along with vm-rfc1153-digest-headers determines which headers are kept and which headers are discarded. ! If the value of vm-rfc1153-digest-discard-header-regexp is nil, the headers ! matched by vm-rfc1153-digest-headers are the only headers that will be kept. ! If vm-rfc1153-digest-discard-header-regexp is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. vm-rfc1153-digest-headers determines the order of appearance in that case, with headers not matching any in the ! vm-rfc1153-digest-headers list appearing last in the headers of the digestified messages.") --- 1703,1716 ---- what headers should not appear in RFC 1153 digests created by VM. This ! variable along with `vm-rfc1153-digest-headers' determines which headers are kept and which headers are discarded. ! If the value of `vm-rfc1153-digest-discard-header-regexp' is nil, the headers ! matched by `vm-rfc1153-digest-headers' are the only headers that will be kept. ! If `vm-rfc1153-digest-discard-header-regexp' is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. `vm-rfc1153-digest-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-rfc1153-digest-headers' list appearing last in the headers of the digestified messages.") *************** *** 1718,1728 **** ! If the value of vm-mime-digest-discard-header-regexp is nil, the headers ! matched by vm-mime-digest-headers are the only headers that will be kept. ! If vm-mime-digest-discard-header-regexp is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. vm-mime-digest-headers determines the order of appearance in that case, with headers not matching any in the ! vm-mime-digest-headers list appearing last in the headers of the digestified messages.") --- 1736,1746 ---- ! If the value of `vm-mime-digest-discard-header-regexp' is nil, the headers ! matched by `vm-mime-digest-headers' are the only headers that will be kept. ! If `vm-mime-digest-discard-header-regexp' is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. `vm-mime-digest-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-mime-digest-headers' list appearing last in the headers of the digestified messages.") *************** *** 1732,1745 **** which headers should not appear in MIME digests created ! by VM. This variable along with vm-mime-digest-headers determines which headers are kept and which are discarded. ! If the value of vm-mime-digest-discard-header-regexp is nil, the headers ! matched by vm-mime-digest-headers are the only headers that will be kept. ! If vm-mime-digest-discard-header-regexp is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. vm-mime-digest-headers determines the order of appearance in that case, with headers not matching any in the ! vm-mime-digest-headers list appearing last in the headers of the digestified messages.") --- 1750,1763 ---- which headers should not appear in MIME digests created ! by VM. This variable along with `vm-mime-digest-headers' determines which headers are kept and which are discarded. ! If the value of `vm-mime-digest-discard-header-regexp' is nil, the headers ! matched by `vm-mime-digest-headers' are the only headers that will be kept. ! If `vm-mime-digest-discard-header-regexp' is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. `vm-mime-digest-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-mime-digest-headers' list appearing last in the headers of the digestified messages.") *************** *** 1756,1758 **** "*List of headers that should be appear in messages resent with ! vm-resend-bounced-message. These should be listed in the order you wish them to appear in the message. Regular expressions are allowed. --- 1774,1776 ---- "*List of headers that should be appear in messages resent with ! `vm-resend-bounced-message'. These should be listed in the order you wish them to appear in the message. Regular expressions are allowed. *************** *** 1764,1774 **** ! If the value of vm-resend-bounced-discard-header-regexp is nil, the headers ! matched by vm-resend-bounced-headers are the only headers that will be kept. ! If vm-resend-bounced-discard-header-regexp is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. vm-resend-bounced-headers determines the order of appearance in that case, with headers not matching any in the ! vm-resend-bounced-headers list appearing last in the headers of the message.") --- 1782,1792 ---- ! If the value of `vm-resend-bounced-discard-header-regexp' is nil, the headers ! matched by `vm-resend-bounced-headers' are the only headers that will be kept. ! If `vm-resend-bounced-discard-header-regexp' is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. `vm-resend-bounced-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-resend-bounced-headers' list appearing last in the headers of the message.") *************** *** 1778,1791 **** what headers should not appear in a resent bounced message. This ! variable along with vm-resend-bounced-headers determines which headers are kept and which headers are discarded. ! If the value of vm-resend-bounced-discard-header-regexp is nil, ! the headers matched by vm-resend-bounced-headers are the only headers that will be kept. ! If vm-resend-bounced-discard-header-regexp is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. vm-resend-bounced-headers determines the order of appearance in that case, with headers not matching any in the ! vm-resend-bounced-headers list appearing last in the headers of the message.") --- 1796,1809 ---- what headers should not appear in a resent bounced message. This ! variable along with `vm-resend-bounced-headers' determines which headers are kept and which headers are discarded. ! If the value of `vm-resend-bounced-discard-header-regexp' is nil, ! the headers matched by `vm-resend-bounced-headers' are the only headers that will be kept. ! If `vm-resend-bounced-discard-header-regexp' is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. `vm-resend-bounced-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-resend-bounced-headers' list appearing last in the headers of the message.") *************** *** 1794,1796 **** "*List of headers that should be appear in messages resent with ! vm-resend-message. These should be listed in the order you wish them to appear in the message. Regular expressions are allowed. --- 1812,1814 ---- "*List of headers that should be appear in messages resent with ! `vm-resend-message'. These should be listed in the order you wish them to appear in the message. Regular expressions are allowed. *************** *** 1802,1812 **** ! If the value of vm-resend-discard-header-regexp is nil, the headers ! matched by vm-resend-headers are the only headers that will be kept. ! If vm-resend-discard-header-regexp is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. vm-resend-headers determines the order of appearance in that case, with headers not matching any in the ! vm-resend-headers list appearing last in the headers of the message.") --- 1820,1830 ---- ! If the value of `vm-resend-discard-header-regexp' is nil, the headers ! matched by `vm-resend-headers' are the only headers that will be kept. ! If `vm-resend-discard-header-regexp' is non-nil, then only headers matched by that variable will be discarded; all others ! will be kept. `vm-resend-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-resend-headers' list appearing last in the headers of the message.") *************** *** 1816,1829 **** what headers should not appear in a resent message. This ! variable along with vm-resend-headers determines which headers are kept and which headers are discarded. ! If the value of vm-resend-discard-header-regexp is nil, ! the headers matched by vm-resend-headers are the only headers that will be kept. ! If vm-resend-discard-header-regexp is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. vm-resend-headers determines the order of appearance in that case, with headers not matching any in the ! vm-resend-headers list appearing last in the headers of the message.") --- 1834,1847 ---- what headers should not appear in a resent message. This ! variable along with `vm-resend-headers' determines which headers are kept and which headers are discarded. ! If the value of `vm-resend-discard-header-regexp' is nil, ! the headers matched by `vm-resend-headers' are the only headers that will be kept. ! If `vm-resend-discard-header-regexp' is non-nil, then only headers matched by this variable will be discarded; all others ! will be kept. `vm-resend-headers' determines the order of appearance in that case, with headers not matching any in the ! `vm-resend-headers' list appearing last in the headers of the message.") *************** *** 1919,1925 **** messages with a common ancestor will be displayed contiguously in ! the summary. (If you have vm-move-messages-physically set non-nil the folder itself will be reordered to match the thread ordering.) If you use the `%I' summary format specifier in your ! vm-summary-format, indentation will be provided as described in the ! documentation for vm-summary-thread-indent-level (which see). --- 1937,1943 ---- messages with a common ancestor will be displayed contiguously in ! the summary. (If you have `vm-move-messages-physically' set non-nil the folder itself will be reordered to match the thread ordering.) If you use the `%I' summary format specifier in your ! `vm-summary-format', indentation will be provided as described in the ! documentation for `vm-summary-thread-indent-level' (which see). *************** *** 1932,1934 **** set this variable directly, rather you should use the command ! vm-toggle-threads-display, normally bound to C-t.") (make-variable-buffer-local 'vm-summary-show-threads) --- 1950,1952 ---- set this variable directly, rather you should use the command ! `vm-toggle-threads-display', normally bound to C-t.") (make-variable-buffer-local 'vm-summary-show-threads) *************** *** 1945,1948 **** indentation. A reply to this message will be indented by the value ! of vm-summary-thread-indent-level. A reply to that reply will be ! indented twice the value of vm-summary-thread-indent-level.") --- 1963,1966 ---- indentation. A reply to this message will be indented by the value ! of `vm-summary-thread-indent-level'. A reply to that reply will be ! indented twice the value of `vm-summary-thread-indent-level'.") *************** *** 1960,1962 **** the %F or %f summary format specifiers VM will substitute the ! value of vm-summary-uninteresting-senders-arrow (default \"To: \") followed by what would be shown by the %T and %t specifiers --- 1978,1980 ---- the %F or %f summary format specifiers VM will substitute the ! value of `vm-summary-uninteresting-senders-arrow' (default \"To: \") followed by what would be shown by the %T and %t specifiers *************** *** 1966,1968 **** "*String to display before the string that is displayed instead of an ! \"uninteresting\" sender. See vm-summary-uninteresting-senders.") --- 1984,1986 ---- "*String to display before the string that is displayed instead of an ! \"uninteresting\" sender. See `vm-summary-uninteresting-senders'.") *************** *** 2003,2005 **** so depends on the value of the variables with names prefixed by ! `vm-frame-per-'. --- 2021,2023 ---- so depends on the value of the variables with names prefixed by ! ``vm-frame-per-''. *************** *** 2011,2013 **** to better reflect what users expected. This variable is now a ! frame analogue of vm-mutable-windows. --- 2029,2031 ---- to better reflect what users expected. This variable is now a ! frame analogue of `vm-mutable-windows'. *************** *** 2035,2038 **** "*Non-nil value causes VM to display the folder summary in its own frame. ! Nil means the vm-summarize command will use the current frame. ! This variable does not apply to vm-summarize-other-frame, which always create a new frame. --- 2053,2056 ---- "*Non-nil value causes VM to display the folder summary in its own frame. ! Nil means the `vm-summarize' command will use the current frame. ! This variable does not apply to `vm-summarize-other-frame', which always create a new frame. *************** *** 2056,2060 **** (defvar vm-frame-per-edit t ! "*Non-nil value causes vm-edit-message to open a new frame. ! Nil means the vm-edit-message will use the current frame. This ! variable does not apply to vm-edit-message-other-frame, which always create a new frame. --- 2074,2078 ---- (defvar vm-frame-per-edit t ! "*Non-nil value causes `vm-edit-message' to open a new frame. ! Nil means the `vm-edit-message' will use the current frame. This ! variable does not apply to `vm-edit-message-other-frame', which always create a new frame. *************** *** 2082,2084 **** ! If these conditions are met and vm-frame-per-completion's value is non-nil, VM will create a new frame containing a list of --- 2100,2102 ---- ! If these conditions are met and `vm-frame-per-completion''s value is non-nil, VM will create a new frame containing a list of *************** *** 2103,2120 **** ! SYMBOL must be one of `completion', `composition', `edit', ! `folder', `primary-folder' or `summary'. It specifies the type of frame that the following PARAMLIST applies to. ! `completion' specifies parameters for frames that display list of choices generated by a mouse-initiated completing read. ! (See vm-frame-per-completion.) ! `composition' specifies parameters for mail composition frames. ! `edit' specifies parameters for message edit frames ! (e.g. created by vm-edit-message-other-frame) ! `folder' specifies parameters for frames created by `vm' and the ! `vm-visit-' commands. ! `primary-folder' specifies parameters for the frame created by running `vm' without any arguments. ! `summary' specifies parameters for frames that display a summary buffer ! (e.g. created by vm-summarize-other-frame) --- 2121,2138 ---- ! SYMBOL must be one of ``completion'', ``composition'', ``edit'', ! ``folder'', ``primary-folder'' or ``summary''. It specifies the type of frame that the following PARAMLIST applies to. ! ``completion'' specifies parameters for frames that display list of choices generated by a mouse-initiated completing read. ! (See `vm-frame-per-completion'.) ! ``composition'' specifies parameters for mail composition frames. ! ``edit'' specifies parameters for message edit frames ! (e.g. created by `vm-edit-message-other-frame') ! ``folder'' specifies parameters for frames created by `vm' and the ! ``vm-visit-'' commands. ! ``primary-folder'' specifies parameters for the frame created by running `vm' without any arguments. ! ``summary'' specifies parameters for frames that display a summary buffer ! (e.g. created by `vm-summarize-other-frame') *************** *** 2166,2168 **** This variable only has meaning under XEmacs 19.12 and beyond. ! See also vm-toolbar-orientation to control where the toolbar is placed.") --- 2184,2186 ---- This variable only has meaning under XEmacs 19.12 and beyond. ! See also `vm-toolbar-orientation' to control where the toolbar is placed.") *************** *** 2183,2187 **** ! If vm-toolbar is set non-nil VM will use its value as a toolbar instantiator instead of the usual behavior of building a button ! list based on the value of vm-use-toolbar. vm-use-toolbar still must be set non-nil for a toolbar to appear, however. --- 2201,2205 ---- ! If `vm-toolbar' is set non-nil VM will use its value as a toolbar instantiator instead of the usual behavior of building a button ! list based on the value of `vm-use-toolbar'. `vm-use-toolbar' still must be set non-nil for a toolbar to appear, however. *************** *** 2204,2206 **** ! If the value of vm-use-menus is a list, it should be a list of symbols. The symbols and the order that they are listed --- 2222,2224 ---- ! If the value of `vm-use-menus' is a list, it should be a list of symbols. The symbols and the order that they are listed *************** *** 2256,2258 **** browsers and you can pick which one you want to use. If ! vm-popup-menu-on-mouse-3 is set to nil, you will not see the menu. --- 2274,2276 ---- browsers and you can pick which one you want to use. If ! `vm-popup-menu-on-mouse-3' is set to nil, you will not see the menu. *************** *** 2261,2263 **** ! If the value of vm-url-browser is a string, it should specify name of an external browser to run. The URL will be passed to --- 2279,2281 ---- ! If the value of `vm-url-browser' is a string, it should specify name of an external browser to run. The URL will be passed to *************** *** 2265,2267 **** ! If the value of vm-url-browser is a symbol, it should specify a Lisp function to call. The URL will be passed to the program as --- 2283,2285 ---- ! If the value of `vm-url-browser' is a symbol, it should specify a Lisp function to call. The URL will be passed to the program as *************** *** 2289,2292 **** will search from the beginning of the mssage to a point ! vm-url-search-limit / 2 characters into the message. Then VM will ! search from a point vm-url-search-limit / 2 characters from the end of the message to the end of message.") --- 2307,2310 ---- will search from the beginning of the mssage to a point ! `vm-url-search-limit' / 2 characters into the message. Then VM will ! search from a point `vm-url-search-limit' / 2 characters from the end of the message to the end of message.") *************** *** 2319,2321 **** ! See also vm-jump-to-unread-messages.") --- 2337,2339 ---- ! See also `vm-jump-to-unread-messages'.") *************** *** 2327,2329 **** ! The value of vm-jump-to-new-messages takes precedence over the setting of this variable. So if there are unread messages and --- 2345,2347 ---- ! The value of `vm-jump-to-new-messages' takes precedence over the setting of this variable. So if there are unread messages and *************** *** 2331,2333 **** unread message appears before it in the folder, provided ! vm-jump-to-new-messages is non-nil.") --- 2349,2351 ---- unread message appears before it in the folder, provided ! `vm-jump-to-new-messages' is non-nil.") *************** *** 2349,2355 **** "*Non-nil value causes VM's `d' command to automatically invoke ! vm-next-message or vm-previous-message after deleting, to move past the deleted messages. A value of t means motion should ! honor the value of vm-circular-folders. A value that is not t and not nil means that motion should be done as if ! vm-circular-folders is set to nil.") --- 2367,2373 ---- "*Non-nil value causes VM's `d' command to automatically invoke ! `vm-next-message' or `vm-previous-message' after deleting, to move past the deleted messages. A value of t means motion should ! honor the value of `vm-circular-folders'. A value that is not t and not nil means that motion should be done as if ! `vm-circular-folders' is set to nil.") *************** *** 2357,2363 **** "*Non-nil value causes VM's `u' command to automatically invoke ! vm-next-message or vm-previous-message after undeleting, to move past the undeleted messages. A value of t means motion should ! honor the value of vm-circular-folders. A value that is not t and not nil means that motion should be done as if ! vm-circular-folders is set to nil.") --- 2375,2381 ---- "*Non-nil value causes VM's `u' command to automatically invoke ! `vm-next-message' or `vm-previous-message' after undeleting, to move past the undeleted messages. A value of t means motion should ! honor the value of `vm-circular-folders'. A value that is not t and not nil means that motion should be done as if ! `vm-circular-folders' is set to nil.") *************** *** 2365,2371 **** "*Non-nil value causes VM's `k' command to automatically invoke ! vm-next-message or vm-previous-message after killing messages, to try to move past the deleted messages. A value of t means motion ! should honor the value of vm-circular-folders. A value that is not t and not nil means that motion should be done as if ! vm-circular-folders is set to nil.") --- 2383,2389 ---- "*Non-nil value causes VM's `k' command to automatically invoke ! `vm-next-message' or `vm-previous-message' after killing messages, to try to move past the deleted messages. A value of t means motion ! should honor the value of `vm-circular-folders'. A value that is not t and not nil means that motion should be done as if ! `vm-circular-folders' is set to nil.") *************** *** 2377,2379 **** "*Non-nil value causes VM automatically to mark messages for deletion ! after successfully auto-archiving them with the vm-auto-archive-messages command.") --- 2395,2397 ---- "*Non-nil value causes VM automatically to mark messages for deletion ! after successfully auto-archiving them with the `vm-auto-archive-messages' command.") *************** *** 2382,2384 **** "*Non-nil value causes VM automatically to mark a message for deletion ! after it has been successfully burst by the vm-burst-digest command.") --- 2400,2402 ---- "*Non-nil value causes VM automatically to mark a message for deletion ! after it has been successfully burst by the `vm-burst-digest' command.") *************** *** 2424,2427 **** (defvar vm-print-command-switches (if (boundp 'lpr-switches) lpr-switches nil) ! "*List of command line flags passed to the command named by vm-print-command. ! VM uses vm-print-command to print messages.") --- 2442,2446 ---- (defvar vm-print-command-switches (if (boundp 'lpr-switches) lpr-switches nil) ! "*List of command line flags passed to the command named by ! `vm-print-command'. VM uses `vm-print-command' to print ! messages.") *************** *** 2464,2466 **** the system mail spool, or from another folder with ! vm-get-new-mail, or from a digest with vm-burst-digest. When the hooks are run the current buffer will be the folder containing --- 2483,2485 ---- the system mail spool, or from another folder with ! `vm-get-new-mail', or from a digest with `vm-burst-digest'. When the hooks are run the current buffer will be the folder containing *************** *** 2477,2479 **** messages from the system mail spool, or from another folder with ! vm-get-new-mail, or from a digest with vm-burst-digest. When the hooks are run, the new messages will have already been added to --- 2496,2498 ---- messages from the system mail spool, or from another folder with ! `vm-get-new-mail', or from a digest with `vm-burst-digest'. When the hooks are run, the new messages will have already been added to *************** *** 2486,2488 **** composition buffer has been created for a reply. VM runs this ! hook and then runs vm-mail-mode-hook before leaving the user in the Mail mode buffer.") --- 2505,2507 ---- composition buffer has been created for a reply. VM runs this ! hook and then runs `vm-mail-mode-hook' before leaving the user in the Mail mode buffer.") *************** *** 2492,2494 **** composition buffer has been created to forward a message. VM ! runs this hook and then runs vm-mail-mode-hook before leaving the user in the Mail mode buffer.") --- 2511,2513 ---- composition buffer has been created to forward a message. VM ! runs this hook and then runs `vm-mail-mode-hook' before leaving the user in the Mail mode buffer.") *************** *** 2498,2500 **** composition buffer has been created to resend a bounced message. ! VM runs this hook and then runs vm-mail-mode-hook before leaving the user in the Mail mode buffer.") --- 2517,2519 ---- composition buffer has been created to resend a bounced message. ! VM runs this hook and then runs `vm-mail-mode-hook' before leaving the user in the Mail mode buffer.") *************** *** 2504,2506 **** composition buffer has been created to resend a message. ! VM runs this hook and then runs vm-mail-mode-hook before leaving the user in the Mail mode buffer.") --- 2523,2525 ---- composition buffer has been created to resend a message. ! VM runs this hook and then runs `vm-mail-mode-hook' before leaving the user in the Mail mode buffer.") *************** *** 2510,2512 **** composition buffer has been created to send a digest. ! VM runs this hook and then runs vm-mail-mode-hook before leaving the user in the Mail mode buffer.") --- 2529,2531 ---- composition buffer has been created to send a digest. ! VM runs this hook and then runs `vm-mail-mode-hook' before leaving the user in the Mail mode buffer.") *************** *** 2517,2519 **** message, i.e. a message that is not a reply, forward, digest, ! etc. VM runs this hook and then runs vm-mail-mode-hook before leaving the user in the Mail mode buffer.") --- 2536,2538 ---- message, i.e. a message that is not a reply, forward, digest, ! etc. VM runs this hook and then runs `vm-mail-mode-hook' before leaving the user in the Mail mode buffer.") *************** *** 2531,2534 **** It doesn't matter if the folder buffer already exists, this hook ! is run each time vm or vm-visit-folder is called interactively. ! It is NOT run after vm-mode is called.") --- 2550,2553 ---- It doesn't matter if the folder buffer already exists, this hook ! is run each time `vm' or `vm-visit-folder' is called interactively. ! It is NOT run after `vm-mode' is called.") *************** *** 2544,2546 **** "*List of hook functions to be run just before a message is edited. ! This is the last thing vm-edit-message does before leaving the user in the edit buffer.") --- 2563,2565 ---- "*List of hook functions to be run just before a message is edited. ! This is the last thing `vm-edit-message' does before leaving the user in the edit buffer.") *************** *** 2553,2555 **** (defvar vm-mode-hook nil ! "*List of hook functions to run when a buffer enters vm-mode. These hook functions should generally be used to set key bindings --- 2572,2574 ---- (defvar vm-mode-hook nil ! "*List of hook functions to run when a buffer enters `vm-mode'. These hook functions should generally be used to set key bindings *************** *** 2558,2560 **** (defvar vm-mode-hooks nil ! "*Old name for vm-mode-hook. Supported for backward compatibility. --- 2577,2579 ---- (defvar vm-mode-hooks nil ! "*Old name for `vm-mode-hook'. Supported for backward compatibility. *************** *** 2567,2569 **** (defvar vm-summary-mode-hooks nil ! "*Old name for vm-summary-mode-hook. Supported for backward compatibility. --- 2586,2588 ---- (defvar vm-summary-mode-hooks nil ! "*Old name for `vm-summary-mode-hook'. Supported for backward compatibility. *************** *** 2618,2620 **** "*If non-nil, this should name a function to be called inside ! vm-decode-mime-message to do the MIME display the current message. The function is called with no arguments, and at the --- 2637,2639 ---- "*If non-nil, this should name a function to be called inside ! `vm-decode-mime-message' to do the MIME display the current message. The function is called with no arguments, and at the *************** *** 2624,2626 **** will be in the presentation buffer at that time. The normal work ! that vm-decode-mime-message would do is not done, because this function is expected to subsume all of it.") --- 2643,2645 ---- will be in the presentation buffer at that time. The normal work ! that `vm-decode-mime-message' would do is not done, because this function is expected to subsume all of it.") *************** *** 2636,2638 **** ! See the documentation for vm-yank-message to see when VM will run these hooks.") --- 2655,2657 ---- ! See the documentation for `vm-yank-message' to see when VM will run these hooks.") *************** *** 2676,2678 **** "*Name of program to use to run Netscape. ! vm-mouse-send-url-to-netscape uses this.") --- 2695,2697 ---- "*Name of program to use to run Netscape. ! `vm-mouse-send-url-to-netscape' uses this.") *************** *** 2683,2685 **** "*Name of program to use to run Mosaic. ! vm-mouse-send-url-to-mosaic uses this.") --- 2702,2704 ---- "*Name of program to use to run Mosaic. ! `vm-mouse-send-url-to-mosaic' uses this.") *************** *** 2696,2698 **** (defvar vm-tale-is-an-idiot nil ! "*Non-nil value causes vm-mail-send to check multi-line recipient headers of outbound mail for lines that don't end with a --- 2715,2717 ---- (defvar vm-tale-is-an-idiot nil ! "*Non-nil value causes `vm-mail-send' to check multi-line recipient headers of outbound mail for lines that don't end with a *************** *** 2989,2991 **** (defconst vm-supported-folder-types ! '("From_" "From_-with-Content-Length" "mmdf" "babyl")) (defconst vm-supported-window-configurations --- 3008,3010 ---- (defconst vm-supported-folder-types ! '("From_" "BellFrom_" "From_-with-Content-Length" "mmdf" "babyl")) (defconst vm-supported-window-configurations *** dist/vm-version.el.dist Tue Jul 21 21:18:07 1998 --- vm-version.el Fri Jul 24 09:43:36 1998 *************** *** 4,6 **** ! (defconst vm-version "6.58" "Version number of VM.") --- 4,6 ---- ! (defconst vm-version "6.59" "Version number of VM.")