* lisp/battery.el (battery-update): Handle the case where battery
status is "N/A".
Fix bug #17334 with overrunning string bounds when PATH is broken.

 nt/cmdproxy.c (make_absolute): Don't copy more characters from PATH
 than a single directory name can hold.
Fix bug #17308 with inaccurate description of mail signature handling.

 doc/emacs/sending.texi (Mail Signature): Document signature variables used
 by Message mode.
* lisp/desktop.el (desktop-value-to-string): Let-bind `print-length' and `print-level' to nil.
* lisp/progmodes/ps-mode.el: Use SMIE.  Move string and comment recognition
to syntax-propertize.
(ps-mode-auto-indent): Mark as obsolete.
(ps-mode-font-lock-keywords-1): Remove string-or-comment handling.
(ps-mode-font-lock-keywords-3): Use symbol regexp operators instead of
word regexp operators.
(ps-mode-map): Move initialization into declaration.  Remove binding
for TAB, RET, >, ], and }.
(ps-mode-syntax-table): Move initialization into declaration.
Don't give word syntax to non-word chars.
(ps-run-mode-map): Move initialization into declaration.
(ps-mode-menu-main): Remove auto-indent entry.
(ps-mode-smie-rules): New function.
(ps-mode): Setup smie, syntax-propertize, and electric-indent-mode.
(ps-mode-looking-at-nested, ps-mode-match-string-or-comment): Remove.
(ps-mode--string-syntax-table): New const.
(ps-mode--syntax-propertize-special, ps-mode-syntax-propertize):
New functions.
(ps-mode-newline, ps-mode-tabkey, ps-mode-r-brace, ps-mode-r-angle)
(ps-mode-r-gt, ps-mode-r-balance): Remove functions.
lisp/gnus/gnus-art.el (gnus-mime-display-attachment-buttons-in-header): Fix custom group
* lisp/textmodes/rst.el (electric-pair-pairs): Declare.
(rst-mode): Set it.
Use bits_word for gcmarkbits.

* alloc.c (struct cons_block, struct float_block): On 64-bit hosts,
bits_word is typically a tad more efficient for mark bits than
unsigned is, so use bits_word.  All uses changed.
* lisp.h (BITS_PER_INT): Remove; no longer used.
Fix bug 16694 with applying X resources to faces too early.

 lisp/faces.el (face-spec-recalc): Apply X resources only after the
 defface spec has been applied. Thus, X resources are no longer
 overriden by the defface spec which also fixes issues on win32 where
 the toolbar coloring was wrong because it is set through X resources
 and was (wrongfully) overriden.
Fix a typo in ChangeLog entry of last commit.
* doc/lispref/processes.texi (Filter Functions, Sentinels):
Advertise add-function.
Fix bug #17362 with inconsistent usage of @key and @kbd, and key names.

 doc/emacs/trouble.texi (Quitting, DEL Does Not Delete, Emergency Escape)
 (Bug Criteria): Fix usage of @kbd and @key.  (Bug#17362)
 doc/emacs/text.texi (Words, Pages, Foldout, HTML Mode): Fix usage of @kbd
 and @key.
 doc/emacs/search.texi (Special Isearch, Regexp Search): Fix usage of @kbd
 and @key.
 doc/emacs/screen.texi (Echo Area, Menu Bar): Fix usage of @kbd and @key.
 doc/emacs/rmail.texi (Rmail Scrolling): Fix usage of @kbd and @key.
 doc/emacs/programs.texi (Hungry Delete, Other C Commands): Fix usage of
 @kbd and @key.
 doc/emacs/picture-xtra.texi (Insert in Picture): Fix usage of @kbd and
 @key.
 doc/emacs/mule.texi (Unibyte Mode, Bidirectional Editing): Fix usage of
 @kbd and @key.
 doc/emacs/msdog.texi (Windows Keyboard, Windows Processes): Fix usage of
 @kbd and @key.
 doc/emacs/msdog-xtra.texi (MS-DOS Keyboard, MS-DOS Printing)
 (MS-DOS Processes): Fix usage of @kbd and @key.
 doc/emacs/misc.texi (Shell Ring, Printing Package): Fix usage of @kbd and
 @key.
 doc/emacs/mini.texi (Completion Commands, Minibuffer History): Fix usage
 of @kbd and @key.
 doc/emacs/kmacro.texi (Keyboard Macro Step-Edit): Fix usage of @kbd and
 @key.
 doc/emacs/killing.texi (Deletion, Rectangles, CUA Bindings): Fix usage of
 @kbd and @key.
 doc/emacs/indent.texi (Indentation Commands): Fix usage of @kbd and @key.
 doc/emacs/help.texi (Help Mode, Misc Help): Fix usage of @kbd and @key.
 doc/emacs/glossary.texi (Glossary): Fix usage of @kbd and @key.
 doc/emacs/frames.texi (Speedbar): Fix usage of @kbd and @key.
 doc/emacs/files.texi (Misc File Ops, File Name Cache, File Conveniences)
 (Filesets): Fix usage of @kbd and @key.
 doc/emacs/display.texi (View Mode): Fix usage of @kbd and @key.
 doc/emacs/dired.texi (Image-Dired): Fix usage of @kbd and @key.
 doc/emacs/custom.texi (Modifier Keys, Function Keys, Named ASCII Chars)
 (Init Syntax): Fix usage of @kbd and @key.
 doc/emacs/commands.texi (User Input): Fix usage of @kbd and @key.
 doc/emacs/calendar.texi (Counting Days, General Calendar): Fix usage of
 @kbd and @key.
 doc/emacs/building.texi (Threads Buffer): Fix usage of @kbd and @key.
 doc/emacs/buffers.texi (Select Buffer, Icomplete): Fix usage of @kbd and
 @key.
 doc/emacs/basic.texi (Inserting Text, Erasing, Arguments): Fix usage of
 @kbd and @key.
* configure.ac: Treat MirBSD as OpenBSD.
* lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Avoid non-portable "`\" nesting
* src/process.c (handle_child_signal): Handle systems without WCONTINUED
* src/window.c (struct saved_window): Remove mark.
(Fset_window_configuration, save_window_save)
(compare_window_configurations): Don't touch marks any more.
* doc/lispref/windows.texi (Window Configurations, Window Configurations):
Window configs don't store marks any more.
Few more doc fixes for bug #17362.
Place hardware TTY cursor at the active menu item when displaying a menu.

 src/term.c (tty_menu_display): Move the cursor to the active menu
 item.
 (tty_menu_activate): Return the cursor to the active menu item
 after displaying the menu and after displaying help-echo.  See
 http://lists.gnu.org/archive/html/emacs-devel/2014-04/msg00402.html
 for the details of why this is needed by screen readers and
 Braille displays.
* lisp/mail/rmail.el (rmail-quit): Handle killed summaries.
One more doc fix for bug #17362.