upstream

12 files changed, 48 insertions, 24 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 64479f7987f..758025c6c3e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * NEWS: Mention auth-source twice in connection with smtpmail to
+        clarify that smtpmail uses auth-source.
+
 2011-11-20  Bill Wohler  <wohler@newt.com>
 
         Release MH-E version 8.3.1.
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index f02b795a6b9..8b96d08c17a 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -39,6 +39,16 @@ addition of "trunk."
 The `mh-showing-mode' variable is now defined with `define-minor-mode'
 (closes SF #482666).
 
+*** Desktop fails to restore MH-Folder buffers
+
+When restoring MH folders from ".emacs.desktop", Emacs now opens them in
+the expected `mh-folder' mode instead of `dired-mode' (closes SF #1510145)
+
+*** *MH-E Log* buffer can point to removed directory
+This was caused by using `set-buffer' instead of
+`with-current-buffer.' This has been fixed thanks to Stefan Monnier
+(closes SF #1903293).
+
 
 
 * Changes in MH-E 8.2
diff --git a/etc/NEWS b/etc/NEWS
index fe481c4ed8f..f37f562ec82 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -97,10 +97,10 @@ and also when HOME is set to C:\ by default.
 ** Completion
 
 *** shell-mode uses pcomplete rules, with the standard completion UI.
-
++++
 *** Many packages have been changed to use `completion-at-point'
 rather than their own completion code.
-
++++
 *** `completion-at-point' now handles tags and semantic completion.
 ---
 *** Completion in a non-minibuffer now tries to detect the end of completion
@@ -133,7 +133,10 @@ That variable used to have the default value "~/.authinfo", in which
 case you won't see any difference.  But if you changed it to be a list
 of user names and passwords, that setting is now ignored; you will be
 prompted for the user name and the password, which will then be saved
-to ~/.authinfo.
+to ~/.authinfo.  (To control where and how the credentials are stored,
+see the auth-source manual.  You may want to change the auth-source
+preferences if you want to store the credentials encrypted, for
+instance.)
 
 You can also manually copy the credentials to your ~/.authinfo file.
 For example, if you had
@@ -545,7 +548,7 @@ the lines in the current rectangle.  With a prefix argument, this
 prompts for a number to count from and for a format string.
 
 +++
-** The default value of redisplay-dont-change is now t
+** The default value of redisplay-dont-pause is now t
 This makes Emacs feel more responsive to editing commands that arrive
 at high rate, e.g. if you lean on some key, because stopping redisplay
 in the middle (when this variable is nil) forces more expensive
@@ -567,6 +570,7 @@ region (or with the left margin if there is no previous line).
 ** browse-url has a new variable `browse-url-mailto-function'
 specifies how mailto: URLs are handled.  The default is `browse-url-mail'.
 
+---
 ** BibTeX mode
 
 *** BibTeX mode now supports biblatex.
@@ -622,7 +626,7 @@ view-diary-entries, list-diary-entries, show-all-diary-entries
 ** comint and modes derived from it use the generic completion code.
 
 ** Compilation mode
-
+---
 *** Compilation mode can be used without font-lock-mode.
 `compilation-parse-errors-function' is now obsolete.
 
@@ -661,7 +665,7 @@ The new function dbus-register-service registers a service known name
 on a D-Bus without simultaneously registering a property or a method.
 
 ** Dired-x
-
+---
 *** dired-jump and dired-jump-other-window called with a prefix argument
 read a file name from the minibuffer instead of using buffer-file-name.
 
@@ -829,25 +833,29 @@ controlling the degree of parallelism.
 
 ** VC and related modes
 
++++
 *** Support for pulling on distributed version control systems.
-The vc-pull command runs a "pull" operation, if it is supported.
-This updates the current branch from upstream.  A prefix argument
-means to prompt the user for specifics, e.g. a pull location.
+`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported, to
+update the current branch and working tree.  A prefix argument means
+to prompt the user for specifics, e.g. a pull location.
 
 **** `vc-update' is now an alias for `vc-pull'.
 
 **** Currently supported by Bzr, Git, and Mercurial.
 
++++
 *** Support for merging on distributed version control systems.
-The vc-merge command now runs a "merge" operation, if it is supported.
-This merges another branch into the current one.  This command prompts
-the user for specifics, e.g. a merge source.
+The vc-merge command now runs a "merge" operation, if it is supported,
+to merge changes from another branch into the current one.  It prompts
+for specifics, e.g. a merge source.
 
 **** Currently supported for Bzr, Git, and Mercurial.
 
++++
 *** New option `vc-revert-show-diff' controls whether `vc-revert'
 shows a diff while querying the user.  It defaults to t.
 
++++
 *** Log entries in some Log View buffers can be toggled to display a
 longer description by typing RET (log-view-toggle-entry-display).
 In the Log View buffers made by `C-x v L' (vc-print-root-log), you can
@@ -858,6 +866,7 @@ use this to display the full log entry for the revision at point.
 **** Packages using Log View mode can enable this functionality by
 binding `log-view-expanded-log-entry-function' to a suitable function.
 
++++
 *** New command `vc-ediff' allows visual comparison of two revisions
 of a file similar to `vc-diff', but using ediff backend.
 
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 16a9d9dc4cb..df6c4893f87 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -4457,7 +4457,7 @@ highlighting, etc.
 
 So that such output processing may be done efficiently, there is a new
 variable, comint-last-output-start, that records the position of the start of
-the lastest output inserted into the buffer (effectively the previous value
+the last output inserted into the buffer (effectively the previous value
 of process-mark).  Output processing functions should process the text
 between comint-last-output-start (or perhaps the beginning of the line that
 the position lies on) and process-mark.
@@ -6114,7 +6114,7 @@ When you have edited both buffers as you wish, merge them with C-x 6
 1.  This copies the text from the right-hand buffer as a second column
 in the other buffer.  To go back to two-column editing, use C-x 6 s.
 
-Use C-x 6 d to disassociate the two buffers, leaving each as it
+Use C-x 6 d to dissociate the two buffers, leaving each as it
 stands.  (If the other buffer, the one that was not current when you
 type C-x 6 d, is empty, C-x 6 d kills it.)
 
diff --git a/etc/NEWS.22 b/etc/NEWS.22
index 87d77cf52fc..70c7b0e018b 100644
--- a/etc/NEWS.22
+++ b/etc/NEWS.22
@@ -4273,7 +4273,7 @@ of suffixes.  The function also accepts a predicate argument to
 further filter candidate files.
 
 One advantage of using this function is that the list of suffixes in
-`exec-suffixes' is OS-dependant, so this function will find
+`exec-suffixes' is OS-dependent, so this function will find
 executables without polluting Lisp code with OS dependencies.
 
 *** The new function `file-remote-p' tests a file name and returns
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 4e541c0deb3..b9570ee9e29 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -903,7 +903,7 @@ mode-line information (e.g. waiting for a VC command to finish).
 
 *** The mode-line tooltips have been improved to provide more details.
 
-*** The VC, line/colum number and minor mode indicators on the mode
+*** The VC, line/column number and minor mode indicators on the mode
 line are now interactive: mouse-1 can be used on them to pop up a menu.
 
 ** File deletion can make use of the Recycle Bin or system Trash folder.
@@ -1677,7 +1677,7 @@ Running processes on a remote host can be controlled by settings in
 When the variable `file-precious-flag' is set, the success of a remote
 file copy is checked via the file's checksum.
 
-*** Passwords can be read from an authentification file.
+*** Passwords can be read from an authentication file.
 Tramp uses the package `auth-source' to read passwords from a file, if
 necessary.
 
diff --git a/etc/TODO b/etc/TODO
index 5acd8734ad0..2470747bfb5 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -674,7 +674,7 @@ with toolkit-specific code to display the menu bar right to left.
 
 *** image-type-header-regexps priorities the jpeg loader over the
 ImageMagick one.  This is not wrong, but how should a user go about
-prefering the ImageMagick loader?  The user might like zooming etc in jpegs.
+preferring the ImageMagick loader?  The user might like zooming etc in jpegs.
 
 Try (setq image-type-header-regexps nil) for a quick hack to prefer
 ImageMagick over the jpg loader.
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index 957986e8eda..a9ea16d1811 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -43,7 +43,7 @@ Recycle doxygen comment code from the more general template set."
 ----
 
 template variable-same-line-comment :tag
-"A comment occurring after a veriable declaration.
+"A comment occurring after a variable declaration.
 Recycle doxygen comment code from the more general template set."
 ----
 {{>:declaration:doxygen-variable-same-line}}
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 24741fa7741..ac8d8bc1ac2 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -43,7 +43,7 @@ template function-comment :tag :indent :blank
 ----
 
 template variable-same-line-comment :tag
-"A comment occurring after a veriable declaration."
+"A comment occurring after a variable declaration."
 ----
 {{comment_start}} {{?DOC}} {{comment_end}}
 ----
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index c6d2ef1fd54..aeae1c2c389 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -44,7 +44,7 @@ Recycle javadoc comment code from the more general template set."
 ----
 
 template variable-same-line-comment :tag
-"A comment occurring after a veriable declaration.
+"A comment occurring after a variable declaration.
 Recycle javadoc comment code from the more general template set."
 ----
 {{>:declaration:javadoc-variable-same-line}}
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index 6117e72be2a..03a797bb709 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -109,7 +109,7 @@ $<MODEFCN:declaration:function$
        '($MODESYM$-mode-font-lock-keywords
          nil  ;; perform string/comment fontification
          nil  ;; keywords are case sensitive.
-         ;; This puts _ & - as a word constituant,
+         ;; This puts _ & - as a word constituent,
          ;; simplifying our keywords significantly
          ((?_ . "w") (?- . "w"))))
   (run-hooks '$MODESYM$-mode-hook)
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index 3c9aff7ff0d..adbe554216b 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -125,13 +125,13 @@ prompt $?NAME$ "$?PROMPT$"
 bind "p"
 
 template priority :blank
-"Insert a priority statemept."
+"Insert a priority statement."
 ----
 set priority $^$
 ----
 
 template application :blank
-"Insert a priority statemept."
+"Insert an application statement."
 ----
 set application "$^$"
 ----