aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2011-02-27 17:07:29 -0800
committerGlenn Morris2011-02-27 17:07:29 -0800
commit2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch)
treeb924eb1c22ab3bce643676162ef039f250782661 /lisp
parentdf7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff)
parentd1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff)
downloademacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz
emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog10
-rw-r--r--lisp/ChangeLog.102
-rw-r--r--lisp/ChangeLog.126
-rw-r--r--lisp/ChangeLog.310
-rw-r--r--lisp/allout.el8
-rw-r--r--lisp/cedet/semantic/analyze.el2
-rw-r--r--lisp/cedet/semantic/complete.el2
-rw-r--r--lisp/cedet/semantic/edit.el4
-rw-r--r--lisp/cedet/semantic/format.el2
-rw-r--r--lisp/cedet/semantic/java.el2
-rw-r--r--lisp/emulation/viper-cmd.el2
-rw-r--r--lisp/erc/ChangeLog.016
-rw-r--r--lisp/gnus/gnus-agent.el14
-rw-r--r--lisp/gnus/gnus-range.el8
-rw-r--r--lisp/gnus/gnus-start.el8
-rw-r--r--lisp/gnus/nntp.el2
-rw-r--r--lisp/international/mule-cmds.el4
-rw-r--r--lisp/mail/rmail.el2
-rw-r--r--lisp/net/tramp-gvfs.el2
-rw-r--r--lisp/obsolete/sym-comp.el2
-rw-r--r--lisp/org/ChangeLog11
-rw-r--r--lisp/progmodes/cperl-mode.el16
-rw-r--r--lisp/progmodes/idlwave.el4
-rw-r--r--lisp/progmodes/vhdl-mode.el8
-rw-r--r--lisp/replace.el2
-rw-r--r--lisp/textmodes/paragraphs.el2
26 files changed, 80 insertions, 61 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94ff6303901..feed514cdee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12011-02-28 Eli Zaretskii <eliz@gnu.org>
2
3 * international/mule-cmds.el (set-default-coding-systems): Use the
4 -unix variant of encoding in default-keyboard-coding-system.
5 (Bug#8122)
6
12011-02-27 Chong Yidong <cyd@stupidchicken.com> 72011-02-27 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * facemenu.el (list-colors-display): Use with-help-window (Bug#8048). 9 * facemenu.el (list-colors-display): Use with-help-window (Bug#8048).
@@ -4670,7 +4676,7 @@
4670 4676
46712010-10-24 Michael McNamara <mac@mail.brushroad.com> 46772010-10-24 Michael McNamara <mac@mail.brushroad.com>
4672 4678
4673 * verilog-mode.el (verilog-directive-re): Make this variable 4679 * progmodes/verilog-mode.el (verilog-directive-re): Make this variable
4674 auto-built for efficiency of execution and updating. 4680 auto-built for efficiency of execution and updating.
4675 (verilog-extended-complete-re): Support 'pure' fucntion & task 4681 (verilog-extended-complete-re): Support 'pure' fucntion & task
4676 declarations (these have no bodies). 4682 declarations (these have no bodies).
@@ -4704,7 +4710,7 @@
4704 4710
47052010-10-24 Wilson Snyder <wsnyder@wsnyder.org> 47112010-10-24 Wilson Snyder <wsnyder@wsnyder.org>
4706 4712
4707 * verilog-mode.el (verilog-auto-inst, verilog-gate-ios) 4713 * progmodes/verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
4708 (verilog-gate-keywords, verilog-read-sub-decls) 4714 (verilog-gate-keywords, verilog-read-sub-decls)
4709 (verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios) 4715 (verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios)
4710 (verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support 4716 (verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 83ee20fa497..1c2f2b5b015 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -20591,7 +20591,7 @@
20591 20591
20592 * viper-cmd.el (viper-change-state): Got rid of make-local-hook. 20592 * viper-cmd.el (viper-change-state): Got rid of make-local-hook.
20593 (viper-special-read-and-insert-char): Make C-m work right in the r 20593 (viper-special-read-and-insert-char): Make C-m work right in the r
20594 comand. 20594 command.
20595 (viper-buffer-search-enable): Fixed format string. 20595 (viper-buffer-search-enable): Fixed format string.
20596 20596
20597 * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name 20597 * viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index d2f7cab27f0..70c2a45acc9 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -11678,7 +11678,7 @@
11678 make underlining work for wide characters. 11678 make underlining work for wide characters.
11679 (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind 11679 (org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind
11680 TAB to `org-cycle', to make sure that no binding in 11680 TAB to `org-cycle', to make sure that no binding in
11681 `outline-mode-map' can supercede it. 11681 `outline-mode-map' can supersede it.
11682 11682
116832006-03-14 Ken Manheimer <ken.manheimer@gmail.com> 116832006-03-14 Ken Manheimer <ken.manheimer@gmail.com>
11684 11684
@@ -19139,7 +19139,7 @@
19139 * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to 19139 * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
19140 pgg-decrypt-region. 19140 pgg-decrypt-region.
19141 (pgg-pending-timers): A new hash for tracking the passphrase cache 19141 (pgg-pending-timers): A new hash for tracking the passphrase cache
19142 timers, so that new ones supercede old ones. 19142 timers, so that new ones supersede old ones.
19143 (pgg-add-passphrase-to-cache): Rename from 19143 (pgg-add-passphrase-to-cache): Rename from
19144 `pgg-add-passphrase-cache' to reduce confusion (all callers 19144 `pgg-add-passphrase-cache' to reduce confusion (all callers
19145 changed). Modified to cancel old timers when new ones are added. 19145 changed). Modified to cancel old timers when new ones are added.
@@ -19225,7 +19225,7 @@
19225 * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to 19225 * pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
19226 pgg-decrypt-region. 19226 pgg-decrypt-region.
19227 (pgg-pending-timers): A new hash for tracking the passphrase cache 19227 (pgg-pending-timers): A new hash for tracking the passphrase cache
19228 timers, so that new ones supercede old ones. 19228 timers, so that new ones supersede old ones.
19229 (pgg-add-passphrase-to-cache): Rename from 19229 (pgg-add-passphrase-to-cache): Rename from
19230 `pgg-add-passphrase-cache' to reduce confusion (all callers 19230 `pgg-add-passphrase-cache' to reduce confusion (all callers
19231 changed). Modified to cancel old timers when new ones are added. 19231 changed). Modified to cancel old timers when new ones are added.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index b54580ff0bc..8cafac2c0c4 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -4906,7 +4906,7 @@
4906 * two-column.el: Doc fixes. 4906 * two-column.el: Doc fixes.
4907 4907
4908 * loaddefs.el (function-keymap): Definition deleted; this has been 4908 * loaddefs.el (function-keymap): Definition deleted; this has been
4909 superceded by function-key-map. 4909 superseded by function-key-map.
4910 4910
4911 * gomoku.el (gomoku-mode-map): Use function key symbols, instead 4911 * gomoku.el (gomoku-mode-map): Use function key symbols, instead
4912 of the keypad.el facilities. 4912 of the keypad.el facilities.
@@ -6056,7 +6056,7 @@
6056 and `fill-column'. Code now actually sets `left-margin' and 6056 and `fill-column'. Code now actually sets `left-margin' and
6057 `fill-column', as advertised. 6057 `fill-column', as advertised.
6058 * text-mode.el (change-log-mode): Function deleted, since it's 6058 * text-mode.el (change-log-mode): Function deleted, since it's
6059 been superceded by the one in add-log.el. 6059 been superseded by the one in add-log.el.
6060 6060
60611992-06-14 Richard Stallman (rms@mole.gnu.ai.mit.edu) 60611992-06-14 Richard Stallman (rms@mole.gnu.ai.mit.edu)
6062 6062
@@ -6070,7 +6070,7 @@
6070 6070
60711992-06-12 Jim Blandy (jimb@pogo.cs.oberlin.edu) 60711992-06-12 Jim Blandy (jimb@pogo.cs.oberlin.edu)
6072 6072
6073 * isearch-mode.el: New package, which will probably supercede 6073 * isearch-mode.el: New package, which will probably supersede
6074 isearch.el. 6074 isearch.el.
6075 (isearch-mode-map, isearch-mode-meta-map): When initializing 6075 (isearch-mode-map, isearch-mode-meta-map): When initializing
6076 these, remember that vectors are no longer keymaps. 6076 these, remember that vectors are no longer keymaps.
@@ -10009,7 +10009,7 @@
10009 display-time-string. 10009 display-time-string.
10010 (rmail-pop-up): Default display-time-hook to automatically retrieve 10010 (rmail-pop-up): Default display-time-hook to automatically retrieve
10011 new mail if the variable rmail-pop-up is non-nil. 10011 new mail if the variable rmail-pop-up is non-nil.
10012 (add-clock-handler): Removed; superceded by timer.el. 10012 (add-clock-handler): Removed; superseded by timer.el.
10013 10013
10014 * loaddefs.el: Removed add-clock-handler. 10014 * loaddefs.el: Removed add-clock-handler.
10015 10015
@@ -10032,7 +10032,7 @@
10032 10032
10033 * loaddefs.el: Autoload for diff. 10033 * loaddefs.el: Autoload for diff.
10034 10034
10035 * files.el (diff): Superceded by diff.el. 10035 * files.el (diff): Superseded by diff.el.
10036 (diff-switches-function): Still needs to be merged into diff.el. 10036 (diff-switches-function): Still needs to be merged into diff.el.
10037 10037
10038 * diff.el: New file. 10038 * diff.el: New file.
diff --git a/lisp/allout.el b/lisp/allout.el
index d881e1177fa..ca72806b7d9 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -339,7 +339,7 @@ The types of elements in the layout specification are:
339 -- positive numbers open to the relative depth indicated by the 339 -- positive numbers open to the relative depth indicated by the
340 number, but do not force already opened subtopics to be closed. 340 number, but do not force already opened subtopics to be closed.
341 -- 0 means to close topic -- hide all subitems. 341 -- 0 means to close topic -- hide all subitems.
342 : -- repeat spec -- apply the preceeding element to all siblings at 342 : -- repeat spec -- apply the preceding element to all siblings at
343 current level, *up to* those siblings that would be covered by specs 343 current level, *up to* those siblings that would be covered by specs
344 following the `:' on the list. Ie, apply to all topics at level but 344 following the `:' on the list. Ie, apply to all topics at level but
345 trailing ones accounted for by trailing specs. (Only the first of 345 trailing ones accounted for by trailing specs. (Only the first of
@@ -3125,7 +3125,7 @@ situation."
3125 nil) 3125 nil)
3126 ;; rationale: if any intervening items were at a lower depth, we 3126 ;; rationale: if any intervening items were at a lower depth, we
3127 ;; would now be on the first offspring at the target depth -- ie, 3127 ;; would now be on the first offspring at the target depth -- ie,
3128 ;; the preceeding item (per the search direction) must be at a 3128 ;; the preceding item (per the search direction) must be at a
3129 ;; lesser depth. that's all we need to check. 3129 ;; lesser depth. that's all we need to check.
3130 (if backward (allout-next-heading) (allout-previous-heading)) 3130 (if backward (allout-next-heading) (allout-previous-heading))
3131 (if (< allout-recent-depth target-depth) 3131 (if (< allout-recent-depth target-depth)
@@ -4246,7 +4246,7 @@ With a negative argument, the item is shifted out using
4246 4246
4247With an argument greater than one, shift-in the item but not its 4247With an argument greater than one, shift-in the item but not its
4248offspring, making the item into a sibling of its former children, 4248offspring, making the item into a sibling of its former children,
4249and a child of sibling that formerly preceeded it. 4249and a child of sibling that formerly preceded it.
4250 4250
4251You are not allowed to shift the first offspring of a topic 4251You are not allowed to shift the first offspring of a topic
4252inwards, because that would yield a \"containment 4252inwards, because that would yield a \"containment
@@ -5364,7 +5364,7 @@ header and body. The elements of that list are:
5364 5364
5365 (goto-char start) 5365 (goto-char start)
5366 (beginning-of-line) 5366 (beginning-of-line)
5367 ;; Goto initial topic, and register preceeding stuff, if any: 5367 ;; Goto initial topic, and register preceding stuff, if any:
5368 (if (> (allout-goto-prefix-doublechecked) start) 5368 (if (> (allout-goto-prefix-doublechecked) start)
5369 ;; First topic follows beginning point -- register preliminary stuff: 5369 ;; First topic follows beginning point -- register preliminary stuff:
5370 (setq result 5370 (setq result
diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el
index 8a0fbd5cc37..5cdd1577a6e 100644
--- a/lisp/cedet/semantic/analyze.el
+++ b/lisp/cedet/semantic/analyze.el
@@ -100,7 +100,7 @@ Usually bound to the dimension of a single symbol or command.")
100 :type list 100 :type list
101 :documentation "List of tags defining local text. 101 :documentation "List of tags defining local text.
102This can be nil, or a list where the last element can be a string 102This can be nil, or a list where the last element can be a string
103representing text that may be incomplete. Preceeding elements 103representing text that may be incomplete. Preceding elements
104must be semantic tags representing variables or functions 104must be semantic tags representing variables or functions
105called in a dereference sequence.") 105called in a dereference sequence.")
106 (prefixclass :initarg :prefixclass 106 (prefixclass :initarg :prefixclass
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index 31e92724a00..47cb722e005 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -1264,7 +1264,7 @@ inserted into the current context.")
1264;; generated by a collector. This format is in semanticdb search 1264;; generated by a collector. This format is in semanticdb search
1265;; form. This vaguely standard form is a bit challenging to navigate 1265;; form. This vaguely standard form is a bit challenging to navigate
1266;; because the tags do not contain buffer info, but the file associated 1266;; because the tags do not contain buffer info, but the file associated
1267;; with the tags preceed the tag in the list. 1267;; with the tags precedes the tag in the list.
1268;; 1268;;
1269;; Basic displayors don't care, and can strip the results. 1269;; Basic displayors don't care, and can strip the results.
1270;; Advanced highlighting displayors need to know when they need 1270;; Advanced highlighting displayors need to know when they need
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index ef206fd3122..7f7e82a95c2 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -426,7 +426,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
426 ;; confirmed as the lineage of `overlapped-tags' 426 ;; confirmed as the lineage of `overlapped-tags'
427 ;; which must have a value by now. 427 ;; which must have a value by now.
428 428
429 ;; Loop over the search list to find the preceeding CDR. 429 ;; Loop over the search list to find the preceding CDR.
430 ;; Fortunatly, (car overlapped-tags) happens to be 430 ;; Fortunatly, (car overlapped-tags) happens to be
431 ;; the first tag positionally. 431 ;; the first tag positionally.
432 (let ((tokstart (semantic-tag-start (car overlapped-tags)))) 432 (let ((tokstart (semantic-tag-start (car overlapped-tags))))
@@ -874,7 +874,7 @@ pre-positioned to a convenient location."
874 )) 874 ))
875 (message "To Remove Middle Tag: (%s)" 875 (message "To Remove Middle Tag: (%s)"
876 (semantic-format-tag-name first))) 876 (semantic-format-tag-name first)))
877 ;; Find in the cache the preceeding tag 877 ;; Find in the cache the preceding tag
878 (while (and cachestart (not (eq first (car (cdr cachestart))))) 878 (while (and cachestart (not (eq first (car (cdr cachestart)))))
879 (setq cachestart (cdr cachestart))) 879 (setq cachestart (cdr cachestart)))
880 ;; Find the last tag 880 ;; Find the last tag
diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el
index ecd03ccec73..fa6e7517624 100644
--- a/lisp/cedet/semantic/format.el
+++ b/lisp/cedet/semantic/format.el
@@ -296,7 +296,7 @@ local definitions."
296 296
297(define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color) 297(define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color)
298 "Return a canonical name for TAG. 298 "Return a canonical name for TAG.
299A canonical name includes the names of any parents or namespaces preceeding 299A canonical name includes the names of any parents or namespaces preceding
300the tag. 300the tag.
301Optional argument PARENT is the parent type if TAG is a detail. 301Optional argument PARENT is the parent type if TAG is a detail.
302Optional argument COLOR means highlight the prototype with font-lock colors.") 302Optional argument COLOR means highlight the prototype with font-lock colors.")
diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el
index 4489d0ffae5..71a205386db 100644
--- a/lisp/cedet/semantic/java.el
+++ b/lisp/cedet/semantic/java.el
@@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in."
256(define-mode-local-override semantic-documentation-for-tag 256(define-mode-local-override semantic-documentation-for-tag
257 java-mode (&optional tag nosnarf) 257 java-mode (&optional tag nosnarf)
258 "Find documentation from TAG and return it as a clean string. 258 "Find documentation from TAG and return it as a clean string.
259Java have documentation set in a comment preceeding TAG's definition. 259Java has documentation set in a comment preceding TAG's definition.
260Attempt to strip out comment syntactic sugar, unless optional argument 260Attempt to strip out comment syntactic sugar, unless optional argument
261NOSNARF is non-nil. 261NOSNARF is non-nil.
262If NOSNARF is 'lex, then return the semantic lex token." 262If NOSNARF is 'lex, then return the semantic lex token."
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index fae249da9d3..d9b79ccd317 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -2375,7 +2375,7 @@ problems."
2375 (if (eq viper-intermediate-command 'viper-repeat) 2375 (if (eq viper-intermediate-command 'viper-repeat)
2376 (viper-change-subr (mark t) (point)) 2376 (viper-change-subr (mark t) (point))
2377 (viper-change (mark t) (point))) 2377 (viper-change (mark t) (point)))
2378 ;; com is set to ?r when we repeat this comand with dot 2378 ;; com is set to ?r when we repeat this command with dot
2379 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil)) 2379 (viper-set-destructive-command (list 'viper-substitute val ?r nil nil nil))
2380 )) 2380 ))
2381 2381
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 962acd5bfc6..4016586abc7 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -584,9 +584,9 @@
584 584
585 * debian/maint/conffiles.in: new file 585 * debian/maint/conffiles.in: new file
586 586
587 * debian/maint/conffiles: superceded by conffiles.in 587 * debian/maint/conffiles: superseded by conffiles.in
588 588
589 * debian/scripts/startup: superceded by startup.erc 589 * debian/scripts/startup: superseded by startup.erc
590 590
5912001-10-25 Mario Lang <mlang@delysid.org> 5912001-10-25 Mario Lang <mlang@delysid.org>
592 592
@@ -609,7 +609,7 @@
609 609
610 * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, 610 * debian/maint/postinst, debian/maint/prerm, debian/scripts/install,
611 debian/scripts/remove: 611 debian/scripts/remove:
612 removed, superceded by it's .in counterpart 612 removed, superseded by its .in counterpart
613 613
6142001-10-25 Mario Lang <mlang@delysid.org> 6142001-10-25 Mario Lang <mlang@delysid.org>
615 615
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 204d63d37e4..989488c0995 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -441,7 +441,7 @@ manipulated as follows:
441 (setf (gnus-agent-cat-groups old-category) 441 (setf (gnus-agent-cat-groups old-category)
442 (delete group (gnus-agent-cat-groups 442 (delete group (gnus-agent-cat-groups
443 old-category)))))) 443 old-category))))))
444 ;; Purge cache as preceeding loop invalidated it. 444 ;; Purge cache as preceding loop invalidated it.
445 (setq gnus-category-group-cache nil)) 445 (setq gnus-category-group-cache nil))
446 446
447 (setcdr (or (assq 'agent-groups category) 447 (setcdr (or (assq 'agent-groups category)
@@ -1195,7 +1195,7 @@ downloadable."
1195 (mapc #'gnus-summary-remove-process-mark 1195 (mapc #'gnus-summary-remove-process-mark
1196 (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded)) 1196 (gnus-sorted-ndifference gnus-newsgroup-processable gnus-newsgroup-undownloaded))
1197 1197
1198 ;; The preceeding call to (gnus-agent-summary-fetch-group) 1198 ;; The preceding call to (gnus-agent-summary-fetch-group)
1199 ;; updated the temporary gnus-newsgroup-downloadable to 1199 ;; updated the temporary gnus-newsgroup-downloadable to
1200 ;; remove each article successfully fetched. Now, I 1200 ;; remove each article successfully fetched. Now, I
1201 ;; update the real gnus-newsgroup-downloadable to only 1201 ;; update the real gnus-newsgroup-downloadable to only
@@ -1520,14 +1520,14 @@ downloaded into the agent."
1520 header-number) 1520 header-number)
1521 ;; Check each article 1521 ;; Check each article
1522 (while (setq article (pop articles)) 1522 (while (setq article (pop articles))
1523 ;; Skip alist entries preceeding this article 1523 ;; Skip alist entries preceding this article
1524 (while (> article (or (caar alist) (1+ article))) 1524 (while (> article (or (caar alist) (1+ article)))
1525 (setq alist (cdr alist))) 1525 (setq alist (cdr alist)))
1526 1526
1527 ;; Prune off articles that we have already fetched. 1527 ;; Prune off articles that we have already fetched.
1528 (unless (and (eq article (caar alist)) 1528 (unless (and (eq article (caar alist))
1529 (cdar alist)) 1529 (cdar alist))
1530 ;; Skip headers preceeding this article 1530 ;; Skip headers preceding this article
1531 (while (> article 1531 (while (> article
1532 (setq header-number 1532 (setq header-number
1533 (let* ((header (car headers))) 1533 (let* ((header (car headers)))
@@ -3437,7 +3437,7 @@ missing NOV entry. Run gnus-agent-regenerate-group to restore it.")))
3437 3437
3438 ;; If considering all articles is set, I can only 3438 ;; If considering all articles is set, I can only
3439 ;; expire article IDs that are no longer in the 3439 ;; expire article IDs that are no longer in the
3440 ;; active range (That is, articles that preceed the 3440 ;; active range (That is, articles that precede the
3441 ;; first article in the new alist). 3441 ;; first article in the new alist).
3442 (if (and gnus-agent-consider-all-articles 3442 (if (and gnus-agent-consider-all-articles
3443 (>= article-number (car active))) 3443 (>= article-number (car active)))
@@ -3715,7 +3715,7 @@ has been fetched."
3715 (gnus-agent-append-to-list tail-uncached v1)) 3715 (gnus-agent-append-to-list tail-uncached v1))
3716 (setq arts (cdr arts)) 3716 (setq arts (cdr arts))
3717 (setq ref (cdr ref))) 3717 (setq ref (cdr ref)))
3718 (t ; reference article (v2) preceeds the list being filtered 3718 (t ; reference article (v2) precedes the list being filtered
3719 (setq ref (cdr ref)))))) 3719 (setq ref (cdr ref))))))
3720 (while arts 3720 (while arts
3721 (gnus-agent-append-to-list tail-uncached (pop arts))) 3721 (gnus-agent-append-to-list tail-uncached (pop arts)))
@@ -4020,7 +4020,7 @@ If REREAD is not nil, downloaded articles are marked as unread."
4020 ;; article (with the exception of the last ID in the list - it's 4020 ;; article (with the exception of the last ID in the list - it's
4021 ;; special) that no longer appears in the overview. In this 4021 ;; special) that no longer appears in the overview. In this
4022 ;; situtation, the last article ID in the list implies that it, 4022 ;; situtation, the last article ID in the list implies that it,
4023 ;; and every article ID preceeding it, have been fetched from the 4023 ;; and every article ID preceding it, have been fetched from the
4024 ;; server. 4024 ;; server.
4025 4025
4026 (if gnus-agent-consider-all-articles 4026 (if gnus-agent-consider-all-articles
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 794d1642cdd..ce5a837eaef 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -116,10 +116,10 @@ Both ranges must be in ascending order."
116 ;; All done with range2 116 ;; All done with range2
117 (setq r nil)) 117 (setq r nil))
118 ((< max1 min2) 118 ((< max1 min2)
119 ;; No overlap: range1 preceeds range2 119 ;; No overlap: range1 precedes range2
120 (pop r)) 120 (pop r))
121 ((< max2 min1) 121 ((< max2 min1)
122 ;; No overlap: range2 preceeds range1 122 ;; No overlap: range2 precedes range1
123 (pop range2)) 123 (pop range2))
124 ((and (<= min2 min1) (<= max1 max2)) 124 ((and (<= min2 min1) (<= max1 max2))
125 ;; Complete overlap: range1 removed 125 ;; Complete overlap: range1 removed
@@ -232,10 +232,10 @@ RANGE1 and RANGE2 have to be sorted over <."
232 (setq range1 (cdr range1) 232 (setq range1 (cdr range1)
233 range2 (cdr range2)) 233 range2 (cdr range2))
234 (while (and min1 min2) 234 (while (and min1 min2)
235 (cond ((< max1 min2) ; range1 preceeds range2 235 (cond ((< max1 min2) ; range1 precedes range2
236 (setq range1 (cdr range1) 236 (setq range1 (cdr range1)
237 min1 nil)) 237 min1 nil))
238 ((< max2 min1) ; range2 preceeds range1 238 ((< max2 min1) ; range2 precedes range1
239 (setq range2 (cdr range2) 239 (setq range2 (cdr range2)
240 min2 nil)) 240 min2 nil))
241 (t ; some sort of overlap is occurring 241 (t ; some sort of overlap is occurring
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d1ed23f79b3..ebfa53f841e 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1513,7 +1513,7 @@ If SCAN, request a scan of that group as well."
1513 (num 0)) 1513 (num 0))
1514 1514
1515 ;; These checks are present in gnus-activate-group but skipped 1515 ;; These checks are present in gnus-activate-group but skipped
1516 ;; due to setting dont-check in the preceeding call. 1516 ;; due to setting dont-check in the preceding call.
1517 1517
1518 ;; If a cache is present, we may have to alter the active info. 1518 ;; If a cache is present, we may have to alter the active info.
1519 (when (and gnus-use-cache info) 1519 (when (and gnus-use-cache info)
@@ -1887,7 +1887,7 @@ If SCAN, request a scan of that group as well."
1887 ;; OK - I'm done 1887 ;; OK - I'm done
1888 (setq articles nil)) 1888 (setq articles nil))
1889 ((< range article) 1889 ((< range article)
1890 ;; this range preceeds the article. Leave the range unmodified. 1890 ;; this range precedes the article. Leave the range unmodified.
1891 (pop ranges) 1891 (pop ranges)
1892 ranges) 1892 ranges)
1893 ((= range article) 1893 ((= range article)
@@ -1910,11 +1910,11 @@ If SCAN, request a scan of that group as well."
1910 (setcar ranges min) 1910 (setcar ranges min)
1911 ranges) 1911 ranges)
1912 ((< max article) 1912 ((< max article)
1913 ;; this range preceeds the article. Leave the range unmodified. 1913 ;; this range precedes the article. Leave the range unmodified.
1914 (pop ranges) 1914 (pop ranges)
1915 ranges) 1915 ranges)
1916 ((< article min) 1916 ((< article min)
1917 ;; this article preceeds the range. Return null to move to the 1917 ;; this article precedes the range. Return null to move to the
1918 ;; next article 1918 ;; next article
1919 nil) 1919 nil)
1920 (t 1920 (t
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index 09ecfb8f6b7..66a6365cb3b 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -1672,7 +1672,7 @@ password contained in '~/.nntp-authinfo'."
1672 1672
1673 ;; Some nntp servers seem to have an extension to the XOVER 1673 ;; Some nntp servers seem to have an extension to the XOVER
1674 ;; extension. On these servers, requesting an article range 1674 ;; extension. On these servers, requesting an article range
1675 ;; preceeding the active range does not return an error as 1675 ;; preceding the active range does not return an error as
1676 ;; specified in the RFC. What we instead get is the NOV entry 1676 ;; specified in the RFC. What we instead get is the NOV entry
1677 ;; for the first available article. Obviously, a client can 1677 ;; for the first available article. Obviously, a client can
1678 ;; use that entry to avoid making unnecessary requests. The 1678 ;; use that entry to avoid making unnecessary requests. The
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8672fca3a85..5f4d3ea849e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -366,7 +366,9 @@ This also sets the following values:
366 (coding-system-get coding-system 'ascii-compatible-p))) 366 (coding-system-get coding-system 'ascii-compatible-p)))
367 (setq default-file-name-coding-system coding-system))) 367 (setq default-file-name-coding-system coding-system)))
368 (setq default-terminal-coding-system coding-system) 368 (setq default-terminal-coding-system coding-system)
369 (setq default-keyboard-coding-system coding-system) 369 ;; Prevent default-terminal-coding-system from converting ^M to ^J.
370 (setq default-keyboard-coding-system
371 (coding-system-change-eol-conversion coding-system 'unix))
370 ;; Preserve eol-type from existing default-process-coding-systems. 372 ;; Preserve eol-type from existing default-process-coding-systems.
371 ;; On non-unix-like systems in particular, these may have been set 373 ;; On non-unix-like systems in particular, these may have been set
372 ;; carefully by the user, or by the startup code, to deal with the 374 ;; carefully by the user, or by the startup code, to deal with the
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index d5ff0e12c0f..9a892f493d7 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -503,7 +503,7 @@ FIELD is the plain text name of a field in the message, such as
503\"subject\" or \"from\". A FIELD of \"to\" will automatically include 503\"subject\" or \"from\". A FIELD of \"to\" will automatically include
504all text from the \"cc\" field as well. 504all text from the \"cc\" field as well.
505 505
506REGEXP is an expression to match in the preceeding specified FIELD. 506REGEXP is an expression to match in the preceding specified FIELD.
507FIELD/REGEXP pairs continue in the list. 507FIELD/REGEXP pairs continue in the list.
508 508
509examples: 509examples:
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 57cc54935dc..b3278dc312d 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -142,7 +142,7 @@
142 (add-to-list 'tramp-methods (cons elt nil))))) 142 (add-to-list 'tramp-methods (cons elt nil)))))
143 143
144(defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp") 144(defconst tramp-gvfs-path-tramp (concat dbus-path-emacs "/Tramp")
145 "The preceeding object path for own objects.") 145 "The preceding object path for own objects.")
146 146
147(defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon" 147(defconst tramp-gvfs-service-daemon "org.gtk.vfs.Daemon"
148 "The well known name of the GVFS daemon.") 148 "The well known name of the GVFS daemon.")
diff --git a/lisp/obsolete/sym-comp.el b/lisp/obsolete/sym-comp.el
index 6365a1075e0..7e9a460ea14 100644
--- a/lisp/obsolete/sym-comp.el
+++ b/lisp/obsolete/sym-comp.el
@@ -51,7 +51,7 @@ Uses `current-word' with the buffer narrowed to the part before
51point." 51point."
52 (save-restriction 52 (save-restriction
53 ;; Narrow in case point is in the middle of a symbol -- we want 53 ;; Narrow in case point is in the middle of a symbol -- we want
54 ;; just the preceeding part. 54 ;; just the preceding part.
55 (narrow-to-region (point-min) (point)) 55 (narrow-to-region (point-min) (point))
56 (current-word))) 56 (current-word)))
57 57
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 5f0908e11c6..68d957584c6 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,14 @@
12011-02-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * org.el (org-maybe-keyword-time-regexp):
4 * org-icalendar.el (org-icalendar-store-UID):
5 * org-agenda.el (org-agenda-scheduled-leaders)
6 (org-agenda-deadline-leaders, org-agenda-filter-preset):
7 * org-table.el (org-table-current-line-types)
8 (org-table-current-begin-line, org-table-current-begin-pos):
9 (org-table-current-field-formula):
10 Fix typos in docstrings.
11
12011-02-10 Stefan Monnier <monnier@iro.umontreal.ca> 122011-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
2 13
3 * org-remember.el (org-remember-mode-map): 14 * org-remember.el (org-remember-mode-map):
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 7c634d14e6a..f6d497569ba 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -2769,7 +2769,7 @@ Will not look before LIM."
2769 (goto-char (cperl-beginning-of-property p look-prop)) 2769 (goto-char (cperl-beginning-of-property p look-prop))
2770 (beginning-of-line) 2770 (beginning-of-line)
2771 (setq pre-indent-point (point))))) 2771 (setq pre-indent-point (point)))))
2772 (goto-char pre-indent-point) ; Orig line skipping preceeding pod/etc 2772 (goto-char pre-indent-point) ; Orig line skipping preceding pod/etc
2773 (let* ((case-fold-search nil) 2773 (let* ((case-fold-search nil)
2774 (s-s (cperl-get-state (car parse-data) (nth 1 parse-data))) 2774 (s-s (cperl-get-state (car parse-data) (nth 1 parse-data)))
2775 (start (or (nth 2 parse-data) ; last complete sexp terminated 2775 (start (or (nth 2 parse-data) ; last complete sexp terminated
@@ -2796,8 +2796,8 @@ Will not look before LIM."
2796 (cperl-1+ char-after-pos) 'indentable) 2796 (cperl-1+ char-after-pos) 'indentable)
2797 p (1+ (cperl-beginning-of-property 2797 p (1+ (cperl-beginning-of-property
2798 (point) 'indentable)) 2798 (point) 'indentable))
2799 is-block ; misused for: preceeding line in REx 2799 is-block ; misused for: preceding line in REx
2800 (save-excursion ; Find preceeding line 2800 (save-excursion ; Find preceding line
2801 (cperl-backward-to-noncomment p) 2801 (cperl-backward-to-noncomment p)
2802 (beginning-of-line) 2802 (beginning-of-line)
2803 (if (<= (point) p) 2803 (if (<= (point) p)
@@ -2813,10 +2813,10 @@ Will not look before LIM."
2813 prop (parse-partial-sexp p char-after-pos)) 2813 prop (parse-partial-sexp p char-after-pos))
2814 (cond ((not delim) ; End the REx, ignore is-block 2814 (cond ((not delim) ; End the REx, ignore is-block
2815 (vector 'indentable 'terminator p is-block)) 2815 (vector 'indentable 'terminator p is-block))
2816 (is-block ; Indent w.r.t. preceeding line 2816 (is-block ; Indent w.r.t. preceding line
2817 (vector 'indentable 'cont-line char-after-pos 2817 (vector 'indentable 'cont-line char-after-pos
2818 is-block char-after p)) 2818 is-block char-after p))
2819 (t ; No preceeding line... 2819 (t ; No preceding line...
2820 (vector 'indentable 'first-line p)))) 2820 (vector 'indentable 'first-line p))))
2821 ((get-text-property char-after-pos 'REx-part2) 2821 ((get-text-property char-after-pos 'REx-part2)
2822 (vector 'REx-part2 (point))) 2822 (vector 'REx-part2 (point)))
@@ -2897,7 +2897,7 @@ Will not look before LIM."
2897 (cperl-backward-to-start-of-continued-exp containing-sexp)) 2897 (cperl-backward-to-start-of-continued-exp containing-sexp))
2898 (beginning-of-line) 2898 (beginning-of-line)
2899 (cperl-backward-to-noncomment containing-sexp)) 2899 (cperl-backward-to-noncomment containing-sexp))
2900 ;; Now we get non-label preceeding the indent point 2900 ;; Now we get non-label preceding the indent point
2901 (if (not (or (eq (1- (point)) containing-sexp) 2901 (if (not (or (eq (1- (point)) containing-sexp)
2902 (memq (preceding-char) 2902 (memq (preceding-char)
2903 (append (if is-block " ;{" " ,;{") '(nil))) 2903 (append (if is-block " ;{" " ,;{") '(nil)))
@@ -4835,7 +4835,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face',
4835;;; Moreover, one takes positive approach (looks for else,grep etc) 4835;;; Moreover, one takes positive approach (looks for else,grep etc)
4836;;; another negative (looks for bless,tr etc) 4836;;; another negative (looks for bless,tr etc)
4837(defun cperl-after-block-p (lim &optional pre-block) 4837(defun cperl-after-block-p (lim &optional pre-block)
4838 "Return true if the preceeding } (if PRE-BLOCK, following {) delimits a block. 4838 "Return true if the preceding } (if PRE-BLOCK, following {) delimits a block.
4839Would not look before LIM. Assumes that LIM is a good place to begin a 4839Would not look before LIM. Assumes that LIM is a good place to begin a
4840statement. The kind of block we treat here is one after which a new 4840statement. The kind of block we treat here is one after which a new
4841statement would start; thus the block in ${func()} does not count." 4841statement would start; thus the block in ${func()} does not count."
@@ -4864,7 +4864,7 @@ statement would start; thus the block in ${func()} does not count."
4864 (progn 4864 (progn
4865 (forward-sexp -1) 4865 (forward-sexp -1)
4866 (looking-at "sub[ \t\n\f#]")))))) 4866 (looking-at "sub[ \t\n\f#]"))))))
4867 ;; What preceeds is not word... XXXX Last statement in sub??? 4867 ;; What precedes is not word... XXXX Last statement in sub???
4868 (cperl-after-expr-p lim)))) 4868 (cperl-after-expr-p lim))))
4869 (error nil)))) 4869 (error nil))))
4870 4870
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 30d9fc21867..5b7e07a5aad 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -428,7 +428,7 @@ path \(the value of !PATH). However, under Windows and MacOS
428variable can be set to specify the paths where IDLWAVE can find PRO 428variable can be set to specify the paths where IDLWAVE can find PRO
429files. The shell will only be asked for a list of paths when this 429files. The shell will only be asked for a list of paths when this
430variable is nil. The value is a list of directories. A directory 430variable is nil. The value is a list of directories. A directory
431preceeded by a `+' will be searched recursively. If you set this 431preceded by a `+' will be searched recursively. If you set this
432variable on a UNIX system, the shell will not be queried. See also 432variable on a UNIX system, the shell will not be queried. See also
433`idlwave-system-directory'." 433`idlwave-system-directory'."
434 :group 'idlwave-routine-info 434 :group 'idlwave-routine-info
@@ -1197,7 +1197,7 @@ As a user, you should not set this to t.")
1197 (2 font-lock-function-name-face))) 1197 (2 font-lock-function-name-face)))
1198 1198
1199 ;; Keyword parameters, like /xlog or ,xrange=[] 1199 ;; Keyword parameters, like /xlog or ,xrange=[]
1200 ;; This is anchored to the comma preceeding the keyword. 1200 ;; This is anchored to the comma preceding the keyword.
1201 ;; Treats continuation lines, works only during whole buffer 1201 ;; Treats continuation lines, works only during whole buffer
1202 ;; fontification. Slow, use it only in fancy fontification. 1202 ;; fontification. Slow, use it only in fancy fontification.
1203 (keyword-parameters 1203 (keyword-parameters
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index cb1d3c24a94..75b706b74ec 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1775,7 +1775,7 @@ NOTE: Activate the new setting by restarting Emacs.
1775 1775
1776(defcustom vhdl-intelligent-tab t 1776(defcustom vhdl-intelligent-tab t
1777 "*Non-nil means `TAB' does indentation, word completion and tab insertion. 1777 "*Non-nil means `TAB' does indentation, word completion and tab insertion.
1778That is, if preceeding character is part of a word then complete word, 1778That is, if preceding character is part of a word then complete word,
1779else if not at beginning of line then insert tab, 1779else if not at beginning of line then insert tab,
1780else if last command was a `TAB' or `RET' then dedent one step, 1780else if last command was a `TAB' or `RET' then dedent one step,
1781else indent current line (i.e. `TAB' is bound to `vhdl-electric-tab'). 1781else indent current line (i.e. `TAB' is bound to `vhdl-electric-tab').
@@ -6946,7 +6946,7 @@ only-lines."
6946;; Indentation commands 6946;; Indentation commands
6947 6947
6948(defun vhdl-electric-tab (&optional prefix-arg) 6948(defun vhdl-electric-tab (&optional prefix-arg)
6949 "If preceeding character is part of a word or a paren then hippie-expand, 6949 "If preceding character is part of a word or a paren then hippie-expand,
6950else if right of non whitespace on line then insert tab, 6950else if right of non whitespace on line then insert tab,
6951else if last command was a tab or return then dedent one step or if a comment 6951else if last command was a tab or return then dedent one step or if a comment
6952toggle between normal indent and inline comment indent, 6952toggle between normal indent and inline comment indent,
@@ -10396,7 +10396,7 @@ with double-quotes is to be inserted. DEFAULT specifies a default string."
10396 (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num))) 10396 (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num)))
10397 10397
10398(defun vhdl-minibuffer-tab (&optional prefix-arg) 10398(defun vhdl-minibuffer-tab (&optional prefix-arg)
10399 "If preceeding character is part of a word or a paren then hippie-expand, 10399 "If preceding character is part of a word or a paren then hippie-expand,
10400else insert tab (used for word completion in VHDL minibuffer)." 10400else insert tab (used for word completion in VHDL minibuffer)."
10401 (interactive "P") 10401 (interactive "P")
10402 (cond 10402 (cond
@@ -13056,7 +13056,7 @@ hierarchy otherwise.")
13056;; Scan functions 13056;; Scan functions
13057 13057
13058(defun vhdl-scan-context-clause () 13058(defun vhdl-scan-context-clause ()
13059 "Scan the context clause that preceeds a design unit." 13059 "Scan the context clause that precedes a design unit."
13060 (let (lib-alist) 13060 (let (lib-alist)
13061 (save-excursion 13061 (save-excursion
13062 (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|entity\\|package\\)\\>" nil t) 13062 (when (re-search-backward "^[ \t]*\\(architecture\\|configuration\\|entity\\|package\\)\\>" nil t)
diff --git a/lisp/replace.el b/lisp/replace.el
index 0f8adea2aca..928c3170c65 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1531,7 +1531,7 @@ N (match-string N) (where N is a string of digits)
1531#& (string-to-number (match-string 0)) 1531#& (string-to-number (match-string 0))
1532# replace-count 1532# replace-count
1533 1533
1534Note that these symbols must be preceeded by a backslash in order to 1534Note that these symbols must be preceded by a backslash in order to
1535type them using Lisp syntax." 1535type them using Lisp syntax."
1536 (while (consp n) 1536 (while (consp n)
1537 (cond 1537 (cond
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index 70f11cf66dc..a0892b5ebba 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -43,7 +43,7 @@ only considered as a candidate to match `paragraph-start' or
43 43
44Prefix argument says to turn mode on if positive, off if negative. 44Prefix argument says to turn mode on if positive, off if negative.
45When the mode is turned on, if there are newlines in the buffer but no hard 45When the mode is turned on, if there are newlines in the buffer but no hard
46newlines, ask the user whether to mark as hard any newlines preceeding a 46newlines, ask the user whether to mark as hard any newlines preceding a
47`paragraph-start' line. From a program, second arg INSERT specifies whether 47`paragraph-start' line. From a program, second arg INSERT specifies whether
48to do this; it can be `never' to change nothing, t or `always' to force 48to do this; it can be `never' to change nothing, t or `always' to force
49marking, `guess' to try to do the right thing with no questions, nil 49marking, `guess' to try to do the right thing with no questions, nil