* mh-e.el (Version, mh-version): Add +bzr to version.
Update release notes to reflect a fixed, reported bug.
Merge from trunk.
(mh-show-folder-map): Add missing key binding for mh-show-pack-folder
(closes SF #3466086).
* mh-e.el (mh-invisible-header-fields-internal): Add X-AnalysisOut,
X-Authentication-Info, X-Auto-Response-Suppress, X-Bayes-Prob, X-Cam-,
X-CanIt-Geo, X-Completed, X-Facebook, X-Forwarded-, X-Generated-By,
X-Headers-End, X-IEEE-UCE, X-Jira-Fingerprint, X-Junkmail-,
X-Launchpad-, X-MXL-Hash, X-Notification-, X-Notifications,
X-Oracle-Calendar. Replace X-DCC-Usenix-Metrics with X-DCC- (addresses
SF #1916032).
(mh-yank-cur-msg): Replace usage of set-buffer with
with-current-buffer in mh-yang-cur-msg, semantics changed in emacs
23 and we do not want to use set-buffer unless we actually want to
change the buffer the user is looking at (cloases SF #2830504).
(mh-invisible-header-fields-internal): Added:
Bounces-To:, Bounces_to:, X-ACL-Warn:, X-BFI:, X-BPS1:, X-BPS2:,
X-Campaign-Id:, X-Campaign:, X-Cloudmark-SP-, X-Destination-ID:,
X-detected-operating-system:, X-DocGen-Version:, X-EM-,
X-Email-Type-Id:, X-FB-SS:, X-FuHaFi:, X-MailFlowPolicy:,
X-mail_abuse-inquires, X-MailingID:, X-Match:,
X-MaxCode-Template:, X-ME-Bayesian:, X-Sendergroup:, X-SFDC-,
X-SMFBL:, X-SMHeaderMap:, X-VGI-OESCD:, X-VirtualServer:,
X-VirtualServerGroup:, X-XPT-XSL-Name:, X-Y-GMX-Trusted:,
X-XWALL-, X-ZixNet:. Changed X-Habeas-SWE- to X-Habeas-. Updated
the comment. (addresses SF #1916032).
* ChangeLog: Fix typo.
Postpone junk processing (closes SF #2945712). Patch submitted by Ted
Phelps and refined by Bill Wohler.

* mh-e.el (mh-blacklist, mh-whitelist): New variables.
(mh-whitelist-preserves-sequences-flag): New option.
(mh-before-commands-processed-hook): Update documentation.
(mh-blacklist-msg-hook, mh-whitelist-msg-hook): New hooks.
(mh-folder-blacklisted, mh-folder-whitelisted): New faces.
* mh-folder.el (mh-folder-message-menu): Add "Junk" to "Undo."
(mh-folder-font-lock-keywords): Add regexps for blacklisted and
whitelisted messages.
(mh-folder-mode): Add mh-blacklist and mh-whitelist variables.
(mh-execute-commands): Update documentation.
(mh-undo, mh-outstanding-commands-p, mh-process-commands)
(mh-delete-a-msg, mh-refile-a-msg, mh-undo-msg): Handle blacklisted
and whitelisted messages.
* mh-junk.el (mh-junk-blacklist, mh-junk-whitelist): Update to put
messages in blacklist and whitelist respectively for latter
processing.
(mh-blacklist-a-msg, mh-junk-whitelist-a-msg): New function to support
previous functions.
(mh-junk-blacklist-disposition): New function.
(mh-junk-process-blacklist, mh-junk-process-whitelist): New functions
that perform the blacklisting and whitelisting respectively that used
to be performed by mh-junk-blacklist and mh-junk-whitelist.
* mh-scan.el (mh-scan-blacklisted-msg-regexp)
(mh-scan-whitelisted-msg-regexp): New scan line regexps.
(mh-scan-good-msg-regexp): Add B and W characters to regexp.
(mh-scan-cmd-note-width): Update documentation.
(mh-note-blacklisted, mh-note-whitelisted): New scan line characters.
* mh-search.el (mh-index-execute-commands): Handle blacklisted and
whitelisted messages.
  Update release notes to reflect a fixed, reported bug.
  Merge from trunk.
Merge Jeff's updates to mh-invisible-header-fields-internal.
(mh-inc-folder): Call mh-process-or-undo-commands
before running to insure we do not lose any pending changes.
(closes SF #2321115).
(mh-invisible-header-fields-internal): Added: X-xsi.
(addresses SF #1916032).
Minor cleanup for times as lists of four integers.

* doc/lispref/os.texi (Time Parsing): Time values can now be four integers.
* lisp/files.el (dir-locals-directory-cache):
* lisp/ps-bdf.el (bdf-file-mod-time, bdf-read-font-info):
Doc fixes.
* lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls):
* lisp/ps-bdf.el (bdf-file-newer-than-time):
Process four-integers time stamps, not two.  Doc fixes.
Emacs manual fixes regarding automatic scrolling.

* display.texi (Auto Scrolling): Fix some inaccuracies, plus
clarifications.
(Horizontal Scrolling): Clarifications.
Fix example for Display Action Functions.

* windows.texi (Display Action Functions): Fix recently added
example.  Suggested by Michael Heerdegen.
Prevent crashes on MS-Windows when w32-downcase-file-names is non-nil.

 src/fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)
 (Fexpand_file_name) [DOS_NT]: Pass encoded file name to
 dostounix_filename.  Prevents crashes down the road, because
 dostounix_filename assumes it gets a unibyte string.  Reported by
 Michel de Ruiter <michel@sentient.nl>, see
 http://lists.gnu.org/archive/html/help-emacs-windows/2012-11/msg00017.html
Fix latest changes in nt/inc/unistd.h.

 nt/inc/unistd.h: Don't include fcntl.h and don't define O_RDWR.
More minor time fixes.

* calendar/time-date.el: Commentary fix.
* net/tramp-sh.el (tramp-do-file-attributes-with-ls): Undo last change;
too much other code depends on (0 0) time stamps.
* net/tramp.el (tramp-time-less-p, tramp-time-subtract):
Add a couple of FIXME comments.
Rename cygwin_convert_path* to cygwin_convert_file_name*
* lisp/window.el (switch-to-buffer): Re-add the warning that was lost in the
code rewrite.