* 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).
Add missing make-local-variable calls in srt-mode.el

* lisp/cedet/srecode/srt-mode.el (srecode-template-mode):
Don't change global values of comment-start, comment-end.
Formatting tweak for variables.texi

* doc/lispref/variables.texi (Adding Generalized Variables):
Use standard formatting for common lisp note about setf functions.
Document new error symbol and function user-error

* doc/lispref/control.texi (Signaling Errors):
* doc/lispref/debugging.texi (Error Debugging):
* doc/lispref/errors.texi (Standard Errors): Add user-error.

* etc/NEWS: Related markup.
* lisp/emacs-lisp/debug.el (debugger-bury-or-kill): Fix :version.
Fix more custom :versions

* lisp/help.el (temp-buffer-max-height):
* lisp/window.el (fit-frame-to-buffer, fit-frame-to-buffer-bottom-margin):
Fix :version.
* doc/lispref/debugging.texi (Error Debugging): Mention debug-on-message.

* etc/NEWS: Related markup.
Document debugger-bury-or-kill

* doc/lispref/debugging.texi (Using Debugger): Mention debugger-bury-or-kill.

* lisp/emacs-lisp/debug.el (debugger-bury-or-kill): Doc tweak.

* etc/NEWS: Related edit.
* lisp/window.el (with-temp-buffer-window): Doc tweak.