lisp/hilit-chg.el (hilit-chg-unload-function): New function.

(highlight-changes-mode, highlight-changes-visible-mode): Fix typos.
(hilit-chg-map-changes): Prefer cardinal number to digit.
(hilit-chg-display-changes): Reflow docstring.
(highlight-changes-rotate-faces): Remove superfluous backslash.

* net/tramp-sh.el (tramp-sh-handle-vc-registered): Do not call
`tramp-send-command-and-check'.

minibuffer.el (minibuffer-completion-help): Use 0 as thefallback value for `base-size'

* minibuffer.el (minibuffer-completion-help): Use 0 as the
fallback value for `base-size'.  (Bug#16933)

lisp/hexl.el: Fix typos in docstrings.

(hexl-address-region, hexl-ascii-region)
(hexl-goto-hex-address, hexl-backward-char, hexl-forward-char)
(hexl-backward-short, hexl-forward-short, hexl-backward-word)
(hexl-forward-word, hexl-previous-line, hexl-next-line):
Use "Hexl mode" for non-hyperlinked hexl-mode references in docstrings.
(hexl-mode): Doc fix.
(hexl-ascii-start-column, hexl-beginning-of-line, hexl-end-of-line)
(hexl-mode-ruler): Fix typos in docstrings.

lisp/strokes.el: Fix typos.

(strokes-xpm-header, strokes-rate-stroke): Fix typos.
(strokes-character, strokes-get-grid-position, strokes-list-strokes):
Remove superfluous backslashes.
(strokes-last-stroke, strokes-global-map, strokes-mode):
Reflow docstrings.
(strokes-xpm-for-stroke, strokes-xpm-to-compressed-string)
(strokes-xpm-for-compressed-string): Use quotes with buffer name.
(strokes-distance-squared, strokes-global-set-stroke)
(strokes-global-set-stroke-string): Doc fixes.
(strokes-help): Fix typos; reflow docstring.

* xterm.c (x_draw_stretch_glyph_string): Reset clipping.  (Bug#16932)

Fix some window code related doc-string and info entries.

* window.el (window-in-direction): Fix doc-string.
* windows.texi (Windows and Frames): Add some missing &optional
designators.  Adjust description of window-in-direction.

* lisp/cedet/semantic/util.el (semantic-complete-symbol):
Replace use of obsolete argument of display-completion-list.

Small smie.el doc and fix

* lisp/emacs-lisp/smie.el (smie-config-guess): Doc fix.
Explicit error if no grammar.
(smie-config-save): Doc fix.  Fix quote typo.

* etc/NEWS: Related edit.

* lisp/electric.el (electric-indent-mode-has-been-called): Remove.
(electric-indent-mode): Fix accordingly.
* lisp/progmodes/cc-mode.el (c-initialize-cc-mode): Only hook into
electric-indent-mode-hook if we obey electric-indent-mode.
(c-basic-common-init): Use (fboundp 'electric-indent-local-mode) to
decide whether we obey electric-indent-mode.
(c-change-set-fl-decl-start, c-extend-after-change-region):
Silence warnings.
(c-electric-indent-mode-hook): Assume we do want to obey
electric-indent-mode.

* lisp/files.el (hack-local-variables): Mention file name in warning.

* lisp/htmlfontify.el (hfy-fontify-buffer): Drop `invis-range' message.

* binding.el: Add comment describing why C-d binds to `delete-char'.
* lisp/simple.el (delete-forward-char): Mark as interactive-only.
* src/cmds.c (delete-char): Update docstring pointing out that the
function ignores `delete-active-region' and `overwrite-mode'.

Fix bug #16930 with broken build --without-x.

 src/font.c (Fframe_font_cache): Fix last change.

doc/misc/*.texi: Fix typos and whitespace.

* doc/misc/ede.texi (Android projects):
* doc/misc/eieio.texi (Class Options, Making New Objects)
  (Method Invocation, CLOS compatibility):
* doc/misc/sem-user.texi (Tag Decoration Mode): Fix typos.

* doc/misc/gnus.texi:
* doc/misc/semantic.texi: Fix whitespace.

ChangeLog entries should be usable without the VCS

Fix crashes in lisp_align_free in a build with GC_MCHECK.

 src/gmalloc.c (aligned_alloc): Fix adjustment of size of the
 allocated buffer due to alignment.
 (freehook): If the block to be freed was allocated by
 'aligned_alloc', find its real pointer before calling 'free'.
 (mabort) [emacs]: Call 'emacs_abort', not 'abort', to provide a
 backtrace.

Fixes: debbugs:16901

Avoid crashes when X fonts are erroneously freed on reused X
'Display *' connection data (Bug#16069).  Note that X font
resources still may be leaked, but currently there is no way
to completely avoid it.
* xterm.h (struct x_display_info): New member x_id.  Add comments.
* xterm.c (x_display_id): New variable.
(x_term_init): Assign identifier to each opened X connection.
* xfont.c (struct xfont): New member x_display_id.
(xfont_open): Initialize it with frame's display id.
(xfont_close): Check whether font's display id matches the one
recorded for the given display.  Adjust comment.
* xftfont.c (struct xftfont_info):
(xftfont_open, xftfont_close): Exactly as above with xfont stuff.

* font.c (toplevel): Adjust comment about font cache layout.
(font_clear_cache): Fix to match real font cache layout.
Suggested by <namespace_collision@yahoo.com> in Bug#16069.
(Fframe_font_cache) [FONT_DEBUG]: New function.
(syms_of_font) [FONT_DEBUG]: Defsubr it.

Spelling fixes.

*/ChangeLog: Trivial fixes.

lisp/icomplete.el (icomplete-completions): Follow-up to 2014-03-01T01:25:29Z!lekktu@gmail.com.

lisp/icomplete.el, lisp/ido.el: Doc fixes.

lisp/icomplete.el: Miscellaneous doc fixes.
Use Icomplete everywhere instead of icomplete for consistency.
(icomplete-max-delay-chars): Fix typo.
(icomplete-mode): Use \[].
(icomplete-tidy, icomplete-exhibit): Reflow.
(icomplete-minibuffer-setup-hook, icomplete-completions):
Remove superfluous backlashes.

lisp/ido.el: Miscellaneous doc fixes.
Use Ido everywhere instead of ido or `ido' for consistency.
(ido-record-ftp-work-directories, ido-merge-ftp-work-directories)
(ido-cache-ftp-work-directory-time, ido-slow-ftp-hosts)
(ido-slow-ftp-host-regexps, ido-reread-directory): Upcase "ftp".
(ido-separator): Extract obsolescence info from docstring and declare
with make-obsolete-variable.
(ido-minibuffer-setup-hook): Simplify example.
(ido-text, ido-text-init, ido-input-stack, ido-report-no-match)
(ido-wide-find-file, ido-wide-find-dir, ido-wide-find-dir-or-delete-dir)
(ido-completion-help, ido-completing-read): Fix typos in docstrings.
(ido-everywhere): Reflow docstring.
(ido-toggle-vc): Doc fix.
(ido-switch-buffer, ido-find-file): Use tabs to improve legibility
of long list of keybindings.

* etc/NEWS: Tweak previous change.

* etc/NEWS: Minor edit

Minor doc tweaks for display-*-width, height

* lisp/frame.el (display-pixel-height, display-pixel-width)
(display-mm-dimensions-alist, display-mm-height)
(display-mm-width): Doc tweaks.

* doc/lispref/frames.texi: Remove FIXME comments.  The x- versions of
these functions are internal details that do not need documenting.

* etc/NEWS: Related markup.

* markers.texi (Moving Marker Positions): Clarify guidance about
when to move markers and when to create a new one, as discussed at
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16818#17

* simple.el (undo-elt-in-region): Fix buffer corruption for edge
case of undo in region.
* automated/undo-tests.el (undo-test-in-region-not-most-recent):
Add new test of undo in region.
(undo-test-in-region-eob): Add test case described at
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16411#41

In fit-window-to-buffer fix argument in window-size call.

* window.el (fit-window-to-buffer): Fix argument in window-size
call when window is horizontally combined.

* doc/misc/sem-user.texi (Create System Databases): Markup fix.

Document `rectangle-mark-mode'.

* doc/emacs/mark.texi (Mark):
* doc/emacs/killing.texi (Rectangles): Document `rectangle-mark-mode'.

* etc/NEWS: Related edit.

Document zlib-decompress-region

* doc/lispref/text.texi (Decompression): New node.

* doc/lispref/elisp.texi (Top): Update detailed menu.

* etc/NEWS: Related markup.

lisp/icomplete.el (icomplete-completions): Use string-width.
Suggested by Stefan Monier <monnier@iro.umontreal.ca>.

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
regexp options.

Fixes: debbugs:16914

Consider Vother_window_scroll_buffer valid iff it's a live buffer.

* window.c (Fother_window_for_scrolling): Don't try to scroll a
killed Vother_window_scroll_buffer.
(Vother_window_scroll_buffer): Fix doc-string accordingly.

Fix bug #16751 with crashes in expand-file-name on Windows.

 src/fileio.c (Fexpand_file_name) [WINDOWSNT]: Don't treat file names
 that start with more than 2 slashes as UNCs.

Auto-commit of loaddefs files.

Fix size calculation in window--max-delta-1.

* window.el (window--max-delta-1): Round down when calculating
how many lines/columns we can get from a window.

* lisp/subr.el (with-wrapper-hook): Tweak obsolescence message.

* lisp/simple.el: Remove mistaken FIXME comment.

* etc/NEWS: Markup.

* doc/lispref/display.texi (Forcing Redisplay): Mention pre-redisplay-function.

* etc/NEWS: Related markup.

Some doc related to search-invisible and query replace

* doc/emacs/search.texi (Query Replace): Mention search-invisible.

* doc/emacs/text.texi (Outline Visibility): Mention search-invisible
also affects query-replace.

* lisp/isearch.el (search-invisible): Doc fix.

* etc/NEWS: Related markup.

Replace some uses of obsolete argument of display-completion-list

* lisp/minibuffer.el (completion-hilit-commonality):
Make `base-size' argument optional.  Short-cut if `prefix-len' is 0.

* lisp/comint.el (comint-dynamic-list-completions): Doc fix.

* lisp/comint.el (comint-dynamic-list-completions):
* lisp/filecache.el (file-cache-minibuffer-complete):
* lisp/tempo.el (tempo-display-completions):
* lisp/eshell/em-hist.el (eshell-list-history):
Replace use of obsolete argument of display-completion-list.

* lisp/tempo.el: Use utf-8 for author name.

lisp/frame.el: Remove a couple of obsolete FIXME comments.

lisp/icomplete.el: Use "..." when U+2026 cannot be displayed.

Fix a few crashes and leaks when cloning C strings.

* alloc.c, lisp.h (dupstring): New function.
* gtkutil.c (xg_get_font):
* term.c (tty_default_color_capabilities):
* xsettings.c (store_monospaced_changed)
(store_font_name_changed, parse_settings)
(read_and_apply_settings, init_gsettings, init_gconf): Use it.
This avoids some unlikely crashes due to accessing freed storage,
and avoids some minor memory leaks in the more-typical case.

Tweak earlier shr.el change

* etc/NEWS: Minor edits.

* etc/NEWS: Minor edits

lisp/finder.el (finder-unload-function): New function.

Fix docstring typos.

lisp/dframe.el (dframe-detach):
lisp/find-dired.el (find-dired, find-name-dired):
lisp/finder.el (finder-mode-map, finder-mode-syntax-table)
(finder-headmark, finder-select, finder-mouse-select):
Fix typos.

Don't show drag cursor when modeline can't be dragged (Bug#16647).

* xdisp.c (note_mode_line_or_margin_highlight): Don't show drag
cursor when modeline can't be dragged (Bug#16647).

Continuation of previous change.

* doc/lispref/functions.texi (Advising Named Functions): Tweak markup.

* doc/lispref/functions.texi (Advising Functions): Tweak markup.

Revert recent with-temp-buffer-window change (Bug#16816, Bug#16882).

* window.el (with-temp-buffer-window): Revert change from
2014-02-21.  Suggested by Thierry Volpiatto
<thierry.volpiatto@gmail.com>.  Fix doc-string based on a
suggestion by Nicolas Richard <theonewiththeevillook@yahoo.fr>.
* help.el (with-help-window): Fix doc-string.

* net/shr.el (shr-put-image): add custom variable
  `shr-image-animate' to turn off image animation. It is so slow it
  will render emacs unusable.

* automated/tramp-tests.el (tramp--test-enabled)
(tramp-test15-copy-directory): No special handling of tramp-adb.el
anymore.  It's fixed in that package.

* net/tramp-adb.el (tramp-adb-parse-device-names):
Use `accept-process-output'.
(tramp-adb-handle-file-truename): Cache the localname only.
(tramp-adb-handle-make-directory)
(tramp-adb-handle-delete-directory): Flush file properties correctly.
(tramp-adb-handle-set-file-modes): Do not raise an error when file
modes cannot be changed.

* net/tramp-cache.el (tramp-flush-directory-property): Remove also
file properties of symlinks.

* textmodes/bibtex.el (bibtex-biblatex-entry-alist): Update required/optional
fields to match development biblatex.  (Trivial change that does not merit
a :version bump.)

Fixes: debbugs:16781

* lisp/saveplace.el (toggle-save-place): Fix argument handling (tiny change)

Fixes: debbugs:16673

* doc/misc/info.texi (Help-Xref): Add submenu.

This placates makeinfo 5.2, which otherwise actually emits a warning;
surely a flagrant breach of the makeinfo philosophy...?

Remove no-longer-relevant text about writing Info nodes by hand

Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00359.html

* doc/misc/info.texi (Further Reading): Rename node from Expert Info.
Remove stuff about writing Info nodes by hand.
(Help-Cross): Move node from (mainly deleted) chapter 3 to chapter 1.

* doc/misc/info.texi: Nuke hand-written node pointers.

* etc/NEWS: Minor edit

* doc/emacs/custom.texi: Typo fix.

Some doc fixes for completion-hilit-commonality and friends

* lisp/minibuffer.el (completions-first-difference)
(completions-common-part, completion-hilit-commonality): Doc fixes.

Doc fix for `face-spec-set'.

* doc/lispref/display.texi (Defining Faces): Doc fix for
  `face-spec-set'.

* etc/NEWS: Copyedit.

Document `prettify-symbols-mode' and `global-prettify-symbols-mode'.

* doc/emacs/emacs.texi (Top):
* doc/emacs/programs.texi (Programs, Prettifying Symbols):
Document `prettify-symbols-mode' and `global-prettify-symbols-mode'.

* etc/NEWS: Markup changes.

* info.el: Comment.

Add H binding to info, for compatibility with standalone info
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-02/msg00309.html

* lisp/info.el (Info-mode-map): Add H for describe-mode,
to synchronize with standalone Info.

* doc/misc/info.texi (Top): Mention H for a summary of all commands.

* src/doc.c (Fsnarf_documentation): Snarf not-yet-bound variables
from custom-delayed-init-variables.

Fixes: debbugs:11565

* lisp/progmodes/sql.el (sql-interactive-mode): Avoid setting global value
of comint-input-ring-separator.

Fixes: debbugs:16814

Document `define-alternatives'.

* doc/lispref/elisp.texi (Top):
* doc/lispref/commands.texi (Generic Commands):
(Defining Commands): Document `define-alternatives'.

* etc/NEWS: Related edit.  Unrelated copyedit.

Some desktop doc.

* doc/emacs/misc.texi (Saving Emacs Sessions): Document some new desktop user options.

More fixes for mouse glyph calculations (Bug#16647).

More fixes for mouse glyph calculations (Bug#16647).
* window.c (coordinates_in_window): In intersection of
horizontal and vertical window dividers prefer the horizontal
one.  Add some extra parens to last fix.
(window_relative_x_coord): Return x-coordinate for header and
mode line too.
* xdisp.c (remember_mouse_glyph): In text area don't extend
glyph into mode line to show the vertical drag cursor there
immediately.  Subdivide mouse glyphs in right fringes to show a
horizontal drag cursor as soon as we enter the "grabbable width"
portion.  Handle vertical border case separately.  Do not
subdivide window divider areas.
(note_mouse_highlight): On bottom divider of bottommost windows
show vertical drag cursor only when the minibuffer window can be
resized.

Fix bug #16870 with 'box' face in display strings.

 src/xdisp.c (pop_it): Restore the it->face_box_p flag which could be
 reset by the face of the object just displayed.  See also bug#76.
 (get_next_display_element): If the string came from a display
 property, examine the box face attribute at it->position, not at
 it->current.pos, since the latter was not updated yet.
 (handle_face_prop): Improve commentary.

* net/dbus.el (dbus--init-bus): Declare function.
(dbus-path-local, dbus-interface-local): New defconst.
(dbus-init-bus): Use them.
(dbus-return-values-table): Extend doc.
(dbus-handle-bus-disconnect): Extend error message.

* dbusbind.c (Fdbus__init_bus, Qdbus__init_bus, Sdbus__init_bus):
Rename from Fdbus_init_bus_1, Qdbus_init_bus_1, Sdbus_init_bus_1.

lisp/subr.el (y-or-n-p): Fix double space issue in message.

Document some changes about windows.

* doc/lispref/windows.texi (Window Sizes): Document `window-size'.
(Display Action Functions): Document `display-buffer-at-bottom'.
(Window Configurations): Minor fixes.

* doc/lispref/modes.texi (Header Lines): Document `window-header-line-height'.

* doc/lispref/display.texi (Scroll Bars): Document `window-scroll-bar-width'.

* etc/NEWS: Related markup.

Document some (perhaps incomplete) pixelwise window operations.

* doc/lispref/windows.texi (Window Sizes, Resizing Windows):
Document some pixelwise window operations.

* automated/tramp-tests.el (tramp--test-enabled): Move connection
cleanup into this function.  Remove respective code from all test cases.
(tramp--instrument-test-case): Declare `indent' and `debug'.
Handle other errors as well.
(tramp-test14-delete-directory): Check for `file-error' error.
(tramp-test15-copy-directory): Ignore return value of
`copy-directory'.  It's too much hassle to handle it for tramp-adb.el.
(tramp-test19-directory-files-and-attributes): Take care of
timestamp of "../".
(tramp-test20-file-modes, tramp-test27-start-file-process)
(tramp-test28-shell-command): Skip for tramp-adb.el.
(tramp-test21-file-links): `file-truename' shall preserve trailing
link of directories.
(tramp-test22-file-times): Skip if `set-file-times' returns nil.
(tramp-test26-process-file, tramp-test28-shell-command): Let-bind
`kill-buffer-query-functions' to nil.
(tramp-test28-shell-command): Run `async-shell-command' with timeouts.

Some doc about electric-indent-mode.

* doc/lispref/text.texi (Margins): Fix the description of RET and `C-j'.

* doc/emacs/programs.texi (Basic Indent):
(Other C Commands): Fix the description of RET and `C-j'.

* doc/emacs/indent.texi (Indentation Commands): Move the description of
`C-j' from here...
* doc/emacs/basic.texi (Inserting Text): ... to here.

Tramp adb fixes, found during test campaign.
* net/tramp.el (tramp-call-process): Improve trace message.
(tramp-handle-insert-file-contents): Trace error case.

* net/tramp-adb.el (tramp-adb-file-name-handler-alist)
<insert-directory>: Use `tramp-handle-insert-directory'.
(tramp-adb-handle-insert-directory): Remove function.
(tramp-adb-send-command-and-check): New defun, replacing
`tramp-adb-command-exit-status'.  Change all callees.
(tramp-adb-handle-file-attributes)
(tramp-adb-handle-directory-files-and-attributes): Use it.
(tramp-adb-ls-output-name-less-p): Use
`directory-listing-before-filename-regexp'.
(tramp-adb-handle-delete-directory): Flush also file properties of
the truename of directory.
(tramp-adb-handle-file-name-all-completions): Add "./" and "../".
(tramp-adb-handle-file-local-copy): Make the local copy readable.
(tramp-adb-handle-write-region): Implement APPEND.
(tramp-adb-handle-rename-file): Make it more robust.  Flush file
properties correctly.
(tramp-adb-maybe-open-connection): Set `tramp-current-*'
variables.  Check for connected devices only when needed.

Fix previous change.

* doc/lispref/frames.texi (Multiple Terminals): Document
`display-monitor-attributes-list' and `display-monitor-attributes'.
(Display Feature Testing): Add some notes about multi-monitor.

* etc/NEWS: Related edit.

* etc/NEWS: Copyedit.

Small doc related to new completion functions

* doc/lispref/minibuf.texi (Programmed Completion):
Mention completion-table-with-cache.

* lisp/minibuffer.el (completion-table-dynamic)
(completion-table-with-cache): Doc fixes.

* etc/NEWS: Related markup.  Unrelated copyedit.

Some crm.el doc

* lisp/emacs-lisp/crm.el: Remove commentary that duplicates doc strings.
(crm-default-separator, crm-separator) (completing-read-multiple):
Doc fixes.

* etc/NEWS: Related edit.

Fix tramp bug with empty explicit path

Fix tramp bug with empty explicit path

* emacs-lisp/crm.el (completing-read-multiple): Empower help-enable-auto-load.

Fix indentation

NEWS markup

* lisp/startup.el (command-line): Don't init the tty in daemon mode.

Ref: http://debbugs.gnu.org/16859#15

Avoid calling tty-setup-hook twice
eg if a term file explicitly calls tty-run-terminal-initialization

* lisp/faces.el (tty-run-terminal-initialization): Add run-hook argument.
(tty-create-frame-with-faces): Use it.

* lisp/startup.el (command-line): Pass run-hook argument
to tty-run-terminal-initialization.

Fixes: debbugs:16859

* lisp/dired.el (dired-restore-desktop-buffer): Demote errors;
eg in case a glob match fails.

Fixes: debbugs:16884

Fixes around Bug#16647.

* xdisp.c (remember_mouse_glyph): Handle ON_RIGHT_DIVIDER and
ON_BOTTOM_DIVIDER cases.
* window.c (coordinates_in_window): Return ON_VERTICAL_BORDER
only if the window has no right divider.
(Fcoordinates_in_window_p): Fix doc-string.

* lisp/emacs-lisp/lisp.el (lisp--local-variables): Catch `end-of-file'
error from `read-from-string'.

Fixes: debbugs:16850

* lisp/emacs-lisp/ert.el (ert-run-tests-interactively): `read' the
result of `completing-read' in the interactive form.

Fixes: debbugs:16854

src/lread.c (Funintern): Fix doc to match advertised calling convention.