Prefer CALLN in a few more places

* src/macfont.m (macfont_set_family_cache):
* src/nsterm.m (append2):
* src/xterm.c (x_cr_export_frames):
Prefer CALLN to allocating the arg arrays by hand.

Adapt file-notify-test02-events test case

* test/automated/file-notify-tests.el (file-notify-test02-events):
Create a new watch for every test.

; Fix thinko in last commit of filenotify.el

Continue gfilenotify.c implementation of missing parts

* lisp/filenotify.el (file-notify-add-watch): Append `flags' to
`gfile-add-watch' call.
(file-notify-rm-watch): Modify `file-notify-descriptors' only
after calling the low level functions.

* src/gfilenotify.c (dir_monitor_callback): Check, whether
event_type is expected.
(Fgfile_add_watch): Allow also `change'and `attribute-change' for FLAGS.
(Fgfile_rm_watch): Fix typo.
(syms_of_gfilenotify): Declare Qchange and Qattribute_change.

* src/syntax.c: Handle spurious e_property_truncated flag

* src/syntax.c (parse_sexp_propertize): Handle spurious
e_property_truncated flag.
(update_syntax_table_forward): Remove invalid assertion.

Support ':relative-width' space display spec on text-mode terminals

* src/xdisp.c (produce_stretch_glyph): Support ':relative-width'
space display spec on text-mode terminals, by calling
PRODUCE_GLYPHS instead of x_produce_glyphs.  Remove the HAVE_WINDOW_SYSTEM
guards from the supporting code, as well as the test for a GUI frame.

Move let-when-compile to lisp-mode.el

This fixes the bootstrapping problem of `let-when-compile' using
`cl-progv' while being in subr.el (i.e. before cl stuff was loaded).

Do not include authorization header in an HTTP redirect

* lisp/url/url-http.el (url-http-parse-headers): Do not
automatically include Authorization header in redirect.
(Bug#21350)

Clarify documentation of ':relative-width'

* doc/lispref/display.texi (Specified Space): Document that
':relative-width' is only supported on GUI frames.

Fix 'current-column' in presence of :relative-width

* src/indent.c (check_display_width): Support ':relative-width'
in a display spec that specifies a stretch glyph.  (Bug#21533)

Reformat the pdbtrack remote-file fix ChangeLog.2 entry

... to conform better to CONTRIBUTE guidelines.

* prolog.el: Fix indentation of empty line

* lisp/emacs-lisp/smie.el (smie-rules-function): Document new
`empty-line-token' element.
(smie-indent-empty-line): New function.
(smie-indent-functions): Add it.

* lisp/progmodes/prolog.el (prolog-smie-rules): Fix :list-intro behavior
and use the new `empty-line-token' element (bug#21526).
(prolog-mode-variables): Fix comment-start-skip setting to match
comment-start.

* test/indent/prolog.prolog: Add nested indentation tests.

* lisp/newcomment.el (comment-normalize-vars): Fix default value of
comment-start-skip not to misuse submatch 1.

Make description of `edebug-initial-mode' user friendly.

Fixes debbugs#21365.

dec/lispref/edebug.texi (Edebug Execution Modes): Change the
desscription
of `edebug-initial-mode' from that of its implementation to that of its
visual effect and use.  Move the paragraph higher up.

lisp/progmodes/gud.el (gud-format-command): Fix last commit

* lisp/progmodes/gud.el (gud-format-command): Don't use Tramp internal
functions 'tramp-file-name-localname' and 'tramp-dissect-file-name'.

; * doc/lispref/os.texi (File Notifications): Minor copy-edits.

Improve last commit to process.c

Implement gfile-valid-p

* lisp/filenotify.el (file-notify-callback): Fix typo.
(gfile-valid-p): Remove defalias.

* src/gfilenotify.c (dir_monitor_callback): Cancel the monitor if
the file or directory to be watched is deleted.
(Fgfile_add_watch): Make watch_object a triple.
(Fgfile_rm_watch): Check, whether watch is cancelled already.
(Fgfile_valid_p): New defun.
(syms_of_gfilenotify): Declare Sgfile_valid_p.

Remove callback-handled channels from Available set

* src/process.c (wait_reading_process_output): Remove channel from
Available set if it is handled by a callback, e.g., dbus or
inotify (bug#21313).

Use lunate epsilon for TeX \epsilon

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add
\varepsilon using GREEK SMALL LETTER EPSILON, and change \epsilon to use
GREEK LUNATE EPSILON SYMBOL

* lisp/progmodes/prolog.el: Fix nested electric if-then-else

* lisp/progmodes/prolog.el (prolog-find-unmatched-paren): Use innermost
rather than outermost paren (bug#21526).

Improve git diff hunk headers for .el, .texi

Problem reported by Alan Mackenzie in:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00826.html
* .gitattributes (*.el, *.texi): New patterns.
* autogen.sh: Configure diff.elisp.xfuncname and
diff.texinfo.xfuncname if using Git.

Don't rely on defaults in decoding UTF-8 encoded Lisp files

* lisp/replace.el:
* lisp/textmodes/rst.el:
* lisp/whitespace.el: Add an explicit UTF-8 encoding tag.

Clarify or replace a few \u escapes.

* doc/lispref/nonascii.texi (Character Properties)
More-detailed commentary for \u escapes.
* lisp/progmodes/python.el (python--prettify-symbols-alist):
* lisp/replace.el (query-replace-from-to-separator):
* lisp/textmodes/rst.el (rst-bullets, rst-re-alist-def)
(rst-mode-syntax-table):
* lisp/whitespace.el (whitespace-display-mappings):
Prefer actual character to \u escape when this makes the code
easier to follow in the usual case where Unicode chars can be
displayed.

Pacify GCC -Wmaybe-uninitialized in xdisp.c

* src/xdisp.c (face_before_or_after_it_pos): Use do-while rather
than while loop to avoid GCC -Wmaybe-uninitialized diagnostic with
charpos.  The loop should always execute at least once anyway.

Signal error on invalid regexp

* lisp/textmodes/reftex-cite.el (reftex-extract-bib-entries): Signal an
error when the user tries searching with a regexp matching the empty
string.

Another fix of file-notify-tests for w32notify

* test/automated/file-notify-tests.el (file-notify-test02-events):
Further adaptation for w32notify: reduce the number of expected
'changed' events.  (Bug#21435)

Adapt tests and manual for w32notify

* doc/lispref/os.texi (File Notifications): w32notify does not
send `attribute-changed' events.

* test/automated/file-notify-tests.el (file-notify--test-with-events):
Simplify parameters.  Adapt all callees.
(file-notify-test02-events): w32notify does not send
`attribute-changed' events.
(file-notify-test04-file-validity, file-notify-test05-dir-validity):
Do not skip in case of w32notify.  Simply ignore this part of the test.

Fix setting breakpoints when remote-debugging

* lisp/progmodes/gud.el (gud-format-command): Send localized file
names to the debugger running on the remote.  (Bug#13304)

Better docstring and parameter name for seq-find

* lisp/emacs-lisp/seq.el (seq-find): Improve the docstring and rename
the parameter `sentinel' to `default'.

* doc/lispref/sequences.texi (Sequence Functions): Update the
  documentation for `seq-find' accordingly.

Avoid infinite recursion while displaying box face

* src/xdisp.c (face_before_or_after_it_pos): Fix calculation of
the previous string/buffer character position under bidi
iteration.  (Bug#21428)

Keep upper edge unchanged when changing size of NS frame (Bug#21415)

* src/nsterm.m (x_set_window_size): Keep upper frame edge unchanged
(Bug#21415).

Subject: * lisp/progmodes/prolog.el: Improve handling of if/then/else

(prolog-smie-rules): Accomodate standard if/then/else special indentation.
(prolog-mode): Add . to electric-indent-chars.
(prolog-electric--if-then-else): Re-indent the line before adding space
after the new char (bug#21526).

Add prettify symbols to python-mode

lisp/progmodes/python.el (python-prettify-symbols-alist): New variable
lisp/progmodes/python.el (python-mode): Use it

* lisp/emacs-lisp/syntax.el (syntax-begin-function): Make obsolete

(compilation-error-regexp-alist-alist): Tone down guile-file

* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
Make guile-file a bit less enthusiastic (bug#21496).

Copyright-paperwork-exempt: yes

* m4-mode.el (m4-font-lock-keywords): Fix m4_* highlighting

* lisp/progmodes/m4-mode.el (m4-font-lock-keywords): Fix recognition
of commands when they have a "m4_" prefix.

'.' -> `.' in doc string

* lisp/emacs-lisp/timer.el (run-at-time): In doc string, quote
individual chars with grave quotes instead of straight quotes, as
this works better when they are translated to curved quotes.

Improve file notifications, especially for Tramp

* doc/lispref/files.texi (Magic File Names):
Mention `file-notify-valid-p'.

* doc/lispref/os.texi (File Notifications):
Describe `file-notify-valid-p'.

* etc/NEWS: Add `file-notify-valid-p'.

* lisp/net/tramp-gvfs.el (tramp-gvfs-handle-file-notify-add-watch):
Improve implementation.
(tramp-gvfs-monitor-file-process-filter): Rename from
`tramp-gvfs-file-gvfs-monitor-file-process-filter'.  Delete
process if appropriate.

* lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
Improve implementation.
(tramp-sh-gvfs-monitor-dir-process-filter): Rename from
`tramp-sh-file-gvfs-monitor-dir-process-filter'.  Delete process
if appropriate.
(tramp-sh-inotifywait-process-filter): Rename from
`tramp-sh-file-inotifywait-process-filter'.  Delete process if
appropriate.

* lisp/net/tramp.el (tramp-handle-file-notify-rm-watch):
Use `delete-process'
(tramp-handle-file-notify-valid-p): Check also, that file or
directory to be watched still exists.

* test/automated/file-notify-tests.el (file-notify--test-timeout):
New defun.  Use it at all places a timeout is needed.
(file-notify--test-cleanup): Delete directories recursively.
Cleanup also Tramp connections.
(file-notify-test02-events): Add tests for `attribute-change'.
(file-notify-test04-file-validity, file-notify-test05-dir-validity):
Add tests for `file-notify-rm-watch'.

Use %s to format strings instead of splicing them

If FOO might contain quotes that are part of a file or variable
name, the quotes should not be translated when showing FOO’s name
in a diagnostic.  So, for example, (message (concat (FOO ": bar")))
is not quite right, as it would translate FOO’s quotes.
Change it to (message "%s: bar" FOO) instead.
* lisp/allout.el (allout-process-exposed):
* lisp/calc/calc-ext.el (calc-do-prefix-help):
* lisp/calc/calc-store.el (calc-store-into):
* lisp/calendar/todo-mode.el (todo-category-completions):
* lisp/cedet/semantic/complete.el (semantic-completion-message):
* lisp/org/ob-latex.el (convert-pdf):
* lisp/org/org-crypt.el (org-crypt-check-auto-save):
* lisp/org/ox-latex.el (org-latex-compile):
* lisp/org/ox-man.el (org-man-compile):
* lisp/org/ox-odt.el (org-odt--export-wrap):
* lisp/org/ox-texinfo.el (org-texinfo-compile):
* lisp/progmodes/ruby-mode.el (ruby-in-ppss-context-p):
* lisp/progmodes/verilog-mode.el (verilog-batch-execute-func)
(verilog-signals-combine-bus, verilog-read-defines)
(verilog-getopt-file, verilog-expand-dirnames)
(verilog-modi-lookup, verilog-modi-modport-lookup-one):
* lisp/term/ns-win.el (ns-spi-service-call):
Use %s to avoid translating quotes of file names etc. in diagnostics.

* lisp/progmodes/js.el (js--syntax-begin-function): Remove.

(js-mode): Don't set syntax-begin-function.

Don't assume syntax-begin-function is a symbol.

* lisp/font-lock.el (font-lock-compile-keywords): Don't assume
syntax-begin-function is a symbol.

; * ChangeLog.2: Fix typos and bad formatting, remove unneeded entries

; Auto-commit of ChangeLog files.

Improve documentation of 'run-at-time'

* lisp/emacs-lisp/timer.el (run-at-time): Improve the doc string.
In particular, don't refer to 'diary-entry-time', because it is
unavailable until diary-lib is loaded.  Also, refer to
'timer-duration-words', not 'timer-duration', as the latter's doc
string says nothing about the accepted strings.

* lisp/calc/calc-ext.el (calc-do-prefix-help): Tidy up error message.

Repair pdbtrack so it follows transition from one remote file to another.

* python.el (python-pdbtrack-set-tracked-buffer).

* lisp/emacs-lisp/timer.el (run-at-time): Docstring formatting

Adapt vc-src to the old-new vc-checkin API

* lisp/vc/vc-src.el (vc-src-checkin): Accept and ignore an
additional optional parameter.

Add overflow module to CSS property list

* lisp/textmodes/css-mode.el (css-property-ids): Add properties from CSS
Overflow Module Level 3.

Fix documentation of "C-u C-x v v"

* doc/emacs/maintaining.texi (Advanced C-x v v): Make the
documentation of "C-u C-x v v" match what the code does.

Resurrect the ability to specify a revision in vc-next-action

* lisp/vc/vc-bzr.el (vc-bzr-checkin):
* lisp/vc/vc-dav.el (vc-dav-checkin):
* lisp/vc/vc-git.el (vc-git-checkin):
* lisp/vc/vc-hg.el (vc-hg-checkin):
* lisp/vc/vc-mtn.el (vc-mtn-checkin): Accept and silently ignore
an additional optional argument, the revision to checkin.

* lisp/vc/vc-sccs.el (vc-sccs-checkin):
* lisp/vc/vc-cvs.el (vc-cvs-checkin):
* lisp/vc/vc-rcs.el (vc-rcs-checkin): Allow to optionally specify
a revision to checkin.

* lisp/vc/vc.el (vc-next-action): Allow to optionally specify the
revision when checking in files.

See http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00688.html
for the details.

Fix checkdoc warnings.

    * lisp/progmodes/verilog-mode.el (verilog-forward-sexp-function)
    (verilog-decls-princ) (verilog-modport-princ)
    (verilog-modi-modport-lookup-one): Fix checkdoc warnings.

/svaha/wsnyder/d/log

Fix the routine for help on Calc's prefixes.

* lisp/calc/calc-ext.el (calc-prefix-help-retry): New variable.
(calc-do-prefix-help): Use `read-char' to determine the next Calc
command.

* lisp/font-lock.el (font-lock-beginning-of-syntax-function): Remove

(font-lock-fontify-block): Don't let-bind it.
(font-lock-compile-keywords): Don't use it.
(font-lock-set-defaults): Don't set it.  Allow the variable alist to
start one slot earlier, instead.

* lisp/emacs-lisp/syntax.el (font-lock-beginning-of-syntax-function):
Don't declare.
(syntax-ppss): Don't use it either.

* lisp/font-core.el (font-lock-defaults): Remove SYNTAX-BEGIN
from docstring.

* doc/emacs/display.texi (Font Lock): Don't mention
font-lock-beginning-of-syntax-function.

* doc/lispref/modes.texi (Font Lock Basics): Update description of
font-lock-defaults.
(Syntactic Font Lock): Remove font-lock-beginning-of-syntax-function.

* lisp/loadhist.el (unload-feature-special-hooks):
Remove font-lock-beginning-of-syntax-function.

* lisp/obsolete/lazy-lock.el (lazy-lock-fontify-region):
* lisp/emacs-lisp/lisp.el (beginning-of-defun-raw): Don't let-bind
font-lock-beginning-of-syntax-function.

Backslash cleanup in Elisp source files

This patch should not change behavior.  It typically omits backslashes
where they are redundant (e.g., in the string literal "^\$").
In a few places, insert backslashes where they make regular
expressions clearer: e.g., replace "^\*" (equivalent to "^*") with
"^\\*", which has the same effect as a regular expression.
Also, use ‘\ %’ instead of ‘\%’ when avoiding confusion with SCCS IDs,
and similarly use ‘\ $’ instead of ‘\$’ when avoiding confusion with
RCS IDs, as that makes it clearer that the backslash is intended.

Some more minor backslash fixes

* test/automated/compile-tests.el (compile-tests--test-regexps-data):
* test/automated/info-xref.el (info-xref-test-write-file):
Double backslashes in strings.

Fix several backslash typos in Elisp strings

* lisp/calendar/todo-mode.el (todo-files, todo-rename-file)
(todo-find-filtered-items-file, todo-reset-nondiary-marker)
(todo-reset-done-string, todo-reset-comment-string)
(todo-reset-highlight-item):
* lisp/erc/erc-networks.el (erc-networks-alist):
* lisp/gnus/gnus-art.el (gnus-button-handle-library):
* lisp/gnus/gnus-group.el (gnus-read-ephemeral-gmane-group-url):
* lisp/gnus/nntp.el (nntp-via-shell-prompt)
(nntp-telnet-shell-prompt):
* lisp/gnus/spam-report.el (spam-report-gmane-regex):
* lisp/image-dired.el (image-dired-rotate-original):
(image-dired-get-exif-file-name):
* lisp/international/latin1-disp.el (latin1-display-ucs-per-lynx):
* lisp/mail/undigest.el (rmail-digest-parse-rfc1153strict):
* lisp/mh-e/mh-letter.el (mh-file-is-vcard-p):
* lisp/mh-e/mh-mime.el (mh-file-mime-type-substitutions):
* lisp/net/shr-color.el (shr-color->hexadecimal):
* lisp/org/org-bibtex.el (org-bibtex-fields):
* lisp/org/org-docview.el (org-docview-export):
* lisp/org/org-entities.el (org-entities):
* lisp/org/ox-icalendar.el (org-icalendar-cleanup-string):
* lisp/progmodes/cperl-mode.el (cperl-indent-exp):
* lisp/progmodes/ebnf2ps.el (ebnf-file-suffix-regexp)
(ebnf-style-database):
* lisp/progmodes/idlw-help.el (idlwave-do-context-help1):
* lisp/progmodes/ruby-mode.el (ruby-imenu-create-index-in-block):
* lisp/progmodes/sql.el (sql-product-alist):
* lisp/progmodes/verilog-mode.el (verilog-error-regexp-emacs-alist)
(verilog-error-font-lock-keywords)
(verilog-assignment-operator-re):
* lisp/progmodes/vhdl-mode.el (vhdl-compiler-alist):
* lisp/textmodes/reftex-parse.el (reftex-parse-from-file):
* lisp/vc/add-log.el (change-log-version-number-regexp-list):
Fix typo by replacing ‘\’ with ‘\\’ in a string literal.
For example, to get the regular expression ‘\.’ use the string
literal "\\.", not "\." (which is equivalent to ".").
* lisp/emulation/viper-util.el (viper-glob-unix-files):
Remove stray ‘\j’ from string.
* lisp/gnus/nntp.el (nntp-via-shell-prompt)
(nntp-telnet-shell-prompt):
Treat > like $ when matching a shell prompt.
* lisp/progmodes/make-mode.el (makefile-browse):
Properly quote a diagnostic.

Fix minor quoting problems in diagnostics

* lisp/tutorial.el (tutorial--describe-nonstandard-key):
* lisp/vc/ediff-ptch.el (ediff-fixup-patch-map):
Follow text-quoting-style in diagnostic, and quote a file name.

* doc/lispref/frames.texi (Cursor Parameters): Document 'x-stretch-cursor'.

; Preserve formatting in docstring of dbusbind.c

; Use proper accents in Peter von der Ahé’s name

Omit unnecessary \ before paren in C docstrings

Although \( is needed in docstrings in Elisp code, it is not needed in
docstrings in C code, since C function definitiions do not start with
a parenthesis.  The backslashes made the docstrings a bit harder to
read and to format in columns.  Also, some C docstrings had ( in
column 1 and this did not appear to be causing any problems.  So,
simplify C docstrings by replacing \( with ( and \) with ).

A few more minor quoting fixes in a script and a text file

Minor quoting fixes in scripts and doc

Prefer straight quotes in random script files, as they are not converted.
Prefer grave quotes in a couple of places in the manual that were missed
earlier, as these quotes are converted.

Minor backslash fixes in manuals and scripts

* Makefile.in (install-arch-indep):
* admin/charsets/compact.awk:
* admin/charsets/gb180302.awk (gb_to_index):
* admin/charsets/gb180304.awk (gb_to_index):
Avoid undefined behavior in Awk regular expression backslashes.
* doc/misc/efaq.texi (Matching parentheses):
Omit unnecessary backslashes.
* doc/misc/gnus-faq.texi (FAQ 5-8):
Avoid undefined behavior in suggested sed backslash usage.

Add -Wswitch to --enable-gcc-warnings

Make --enable-gcc-warnings a bit pickier, by also using -Wswitch.
* configure.ac (WERROR_CFLAGS): Don’t add -Wno-switch.
* lib-src/etags.c (main, consider_token, C_entries):
* src/coding.c (encode_invocation_designation):
* src/data.c (Ftype_of):
* src/eval.c (Fdefvaralias, default_toplevel_binding)
(Fbacktrace__locals, mark_specpdl):
* src/lisp.h (record_xmalloc):
* src/syntax.c (scan_lists, scan_sexps_forward):
* src/window.c (window_relative_x_coord):
* src/xdisp.c (push_it, pop_it):
* src/xterm.c (xg_scroll_callback, x_check_fullscreen):
Error out or do nothing (as appropriate) if a switch statement
with an enum value does not cover all of the enum.
* src/dispextern.h (struct iterator_stack_entry.u.comp):
Remove unused member discovered by using -Wswitch.
* src/lisp.h (record_xmalloc): Add a ‘+ 0’ to pacify -Wswitch.
* src/vm-limit.c (check_memory_limits):
Simplify warning-diagnostic computation by using a table.

etags ‘fatal’ function is now printf-like

* lib-src/etags.c (fatal): Now printf-like.  All callers changed.
Also, now static; not clear why it needed to be extern.
(verror): New function, with most of the old contents of ‘error’.
(fatal, error): Use it.

More adaptations in file-notify-tests.el

* test/automated/file-notify-tests.el
(file-notify-test05-dir-validity): Skip for w32notify in
batch-mode.  (Bug#21432)

Adapt test in file-notify-tests.el

* test/automated/file-notify-tests.el
(file-notify-test04-file-validity): Skip for w32notify in
batch-mode.  Add test lost last commit.

winner no longer holds on to dead frames

* lisp/winner.el (winner-change-fun): Cull dead frames.
This prevents a potentially massive memory leak.  See:
http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00619.html

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Use common report_file_notify_error function

* src/fileio.c (report_file_notify_error): New function.

* src/inotify.c (report_inotify_error): Remove function.
(inotify_callback, symbol_to_inotifymask, Finotify_add_watch)
(Finotify_rm_watch): Use report_file_notify_error.

* src/lisp.h (report_file_notify_error): Declare external function.

* src/w32notify.c (report_w32notify_error): Remove function.
(Fw32notify_add_watch, Fw32notify_rm_watch):
Use report_file_notify_error.

Fix documentation.

* doc/misc/calc.texi (Single-Variable Statistics): Fix the wording of
the documentation of the root mean square.

Remove tool_bar_redisplayed_once and associated code.

* src/frame.h (tool_bar_redisplayed_once): Remove slot.
* src/frame.c (make_frame, x_set_font): Remove initialization of
f->tool_bar_redisplayed_once.
* src/w32fns.c (x_change_tool_bar_height):
* src/xfns.c (x_change_tool_bar_height): Don't check for
f->tool_bar_redisplayed_once.
* src/xdisp.c (redisplay_internal): Remove handling of
f->tool_bar_redisplayed_once.

Restore some of the quoting in the manuals

* doc/lispref/windows.texi (Coordinates and Windows)
(Coordinates and Windows):
* doc/lispref/variables.texi (Lexical Binding)
(File Local Variables):
* doc/lispref/text.texi (Format Properties):
* doc/lispref/symbols.texi (Symbol Components):
* doc/lispref/strings.texi (Creating Strings):
* doc/lispref/sequences.texi (Sequence Functions):
* doc/lispref/searching.texi (Regexp Special, Regexp Search)
(Search and Replace):
* doc/lispref/processes.texi (Bindat Spec):
* doc/lispref/os.texi (Idle Timers):
* doc/lispref/objects.texi (Basic Char Syntax):
* doc/lispref/numbers.texi (Float Basics, Random Numbers):
* doc/lispref/nonascii.texi (Character Properties):
* doc/lispref/modes.texi (Major Mode Conventions, Mode Hooks)
(Mode Line Variables):
* doc/lispref/minibuf.texi (Text from Minibuffer):
* doc/lispref/loading.texi (Autoload):
* doc/lispref/keymaps.texi (Controlling Active Maps):
* doc/lispref/frames.texi (Frame Layout, Size and Position)
(Size Parameters, Implied Frame Resizing):
* doc/lispref/files.texi (Changing Files, Magic File Names):
* doc/lispref/eval.texi (Self-Evaluating Forms):
* doc/lispref/display.texi (Progress, Abstract Display)
(Abstract Display Example, Bidirectional Display):
* doc/lispref/commands.texi (Event Mod):
* doc/emacs/windows.texi (Displaying Buffers):
* doc/emacs/trouble.texi (Bug Criteria, Checklist):
* doc/emacs/text.texi (Enriched Text):
* doc/emacs/programs.texi (MixedCase Words):
* doc/emacs/picture-xtra.texi (Insert in Picture)
(Tabs in Picture):
* doc/emacs/misc.texi (Emacs Server, Printing):
* doc/emacs/mini.texi (Minibuffer History):
* doc/emacs/maintaining.texi (Old Revisions, VC Change Log)
(Pulling / Pushing):
* doc/emacs/killing.texi (Yanking, Cut and Paste, Clipboard):
* doc/emacs/help.texi (Help, Help Echo):
* doc/emacs/glossary.texi (Glossary):
* doc/emacs/frames.texi (Mouse Commands, Creating Frames)
(Frame Commands):
* doc/emacs/files.texi (Reverting, Saving, Directories):
* doc/emacs/entering.texi (Exiting):
* doc/emacs/emacs.texi (Top):
* doc/emacs/cmdargs.texi (Window Size X, Icons X):
* doc/emacs/anti.texi (Antinews): Restore quoting of text where
appropriate or replace quoting with @dfn.
* doc/misc/ediff.texi (Window and Frame Configuration):
* doc/lispref/processes.texi (Network Feature Testing):
* doc/lispref/display.texi (Display Margins): Quote the phrase
after "a.k.a." where appropriate.

Clarify reftex-extra-bindings docs.

* lisp/textmodes/reftex-vars.el (reftex-extra-bindings): Document that
the variable only has an effect at load-time.
* doc/misc/reftex.texi (Key Bindings): Ditto.

Fix search argument in ‘lisp--el-match-keyword’ (Bug#21492) (Bug#21493)

* lisp/emacs-lisp/lisp-mode.el (lisp--el-match-keyword): Fix
search argument.  (Bug#21492) (Bug#21493)

Copyright-paperwork-exempt: yes

Add pretty symbols for \qquad and \varrho.

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Add pretty
symbols for \qquad and \varrho.

Add new functions for the root mean square of a (Calc) vector

* lisp/calc/calc-stats.el (calcFunc-rms, calc-vector-rms):
New functions.
* lisp/calc/calc-ext.el (calc-init-extensions): Add keybinding for
`calc-vector-rms', add autoloads for `calc-vector-rms' and
`calcFunc-rms'.
* lisp/calc/calc-map.el (calc-u-oper-keys):  Add entry for
`calcFunc-rms'.
* lisp/calc/calc-menu.el (calc-vectors-menu): Add entry for
`calc-vector-rms'.
* doc/misc/calc.texi (Single-Variable Statistics): Document the rms
command.

Add monotone EDE generic project

* lisp/cedet/ede/generic.el (ede-enable-generic-projects): Add monotone
generic project.

Revert premature commit

* doc/lispref/files.texi: Revert premature commit of change to
file-name-all-completions.

Fix a bug in elisp--xref-find-definitions related to cl-generic defaults

* lisp/progmodes/elisp-mode.el (elisp--xref-find-definitions): Fix bug
with cl-generic defaults.
(elisp--xref-find-references): Add doc string.

* test/automated/elisp-mode-tests.el (xref-elisp-generic-*): Improve
tests to find bug.

Fix bugs in eieio-oref-default related to class symbols

* lisp/emacs-lisp/eieio-core.el (class-p): Handle symbol properly.
(eieio-oref-default): Handle class properly.

; Spelling fixes

Quote “fullboth” when defining it

* doc/lispref/frames.texi (Size Parameters): Use @dfn for “fullboth”
and rewrite the containing paragraph, which was awkward.  (Bug#21472).

Minor doc fix in emacs/ack.texi

* doc/emacs/ack.texi (Acknowledgments): Fix an xref missing the
first argument.

Adapt tests in auto-revert-tests.el

* test/automated/auto-revert-tests.el (auto-revert--timeout):
Make it a defconst.
(auto-revert--wait-for-revert): New defun.
(auto-revert-test00-auto-revert-mode)
(auto-revert-test01-auto-revert-tail-mode)
(auto-revert-test02-auto-revert-mode-dired): Use it.

* lisp/emacs-lisp/lisp-mode.el (lisp-mode-symbol-regexp): New const

Use it everywhere "\\(\\sw\\|\\s_\\|\\\\.\\)+" was used.
(cl-lib-fdefs): Add defgeneric.
(cl-kw): Add all elements of eieio-kw and cl-lib-kw.
(eieio-kw, cl-lib-kw, el-kw): Remove.

Quote less in manuals

The manuals often used quotes ``...'' when it is better to use @dfn or
@code or capitalized words or no quoting at all.  For example, there is
no need for the `` and '' in “if a variable has one effect for
@code{nil} values and another effect for ``non-@code{nil}'' values”.
Reword the Emacs, Lisp intro, and Lisp reference manuals to eliminate
unnecessary quoting like this, and to use @dfn etc. instead when called
for (Bug#21472).

lisp/custom.el (load-theme): Only compute hash when needed

Pacify --enable-gcc-warnings

* src/inotify.c (report_inotify_error): Declare it _Noreturn.

Improve error reports in inotify.c

* src/inotify.c (report_inotify_error): New function.  Clone of
report_w32notify_error.
(inotify_callback, symbol_to_inotifymask, Finotify_add_watch)
(Finotify_rm_watch): Use it.

Fix the file-notify tests for watch validation on w32

* test/automated/file-notify-tests.el
(file-notify-test04-file-validity): Move the directory deletion
out of the file-notify--test-with-events macro.
(file-notify-test04-file-validity)
(file-notify-test05-dir-validity): Enlarge the timeout of
read-event to 0.5, as 0.1 is borderline on w32.  (Bug#21432)

Use OPEN BOX instead of space for \quad.

* lisp/textmodes/tex-mode.el (tex--prettify-symbols-alist): Use OPEN BOX
character for \quad instead of a space.

; Fix last commit log entry.

; make change-history-commit

Add missing *.pbm images

* etc/images/connect.pbm: New file.
* etc/images/custom/down-pushed.pbm: New file.
* etc/images/custom/down.pbm: New file.
* etc/images/custom/right-pushed.pbm: New file.
* etc/images/custom/right.pbm: New file.
* etc/images/describe.pbm: New file.
* etc/images/disconnect.pbm: New file.
* etc/images/ezimage/bits.pbm: New file.
* etc/images/ezimage/bitsbang.pbm: New file.
* etc/images/ezimage/box-minus.pbm: New file.
* etc/images/ezimage/box-plus.pbm: New file.
* etc/images/ezimage/box.pbm: New file.
* etc/images/ezimage/checkmark.pbm: New file.
* etc/images/ezimage/dir-minus.pbm: New file.
* etc/images/ezimage/dir-plus.pbm: New file.
* etc/images/ezimage/dir.pbm: New file.
* etc/images/ezimage/doc-minus.pbm: New file.
* etc/images/ezimage/doc-plus.pbm: New file.
* etc/images/ezimage/doc.pbm: New file.
* etc/images/ezimage/info.pbm: New file.
* etc/images/ezimage/key.pbm: New file.
* etc/images/ezimage/label.pbm: New file.
* etc/images/ezimage/lock.pbm: New file.
* etc/images/ezimage/mail.pbm: New file.
* etc/images/ezimage/page-minus.pbm: New file.
* etc/images/ezimage/page-plus.pbm: New file.
* etc/images/ezimage/page.pbm: New file.
* etc/images/ezimage/tag-gt.pbm: New file.
* etc/images/ezimage/tag-minus.pbm: New file.
* etc/images/ezimage/tag-plus.pbm: New file.
* etc/images/ezimage/tag-type.pbm: New file.
* etc/images/ezimage/tag-v.pbm: New file.
* etc/images/ezimage/tag.pbm: New file.
* etc/images/ezimage/unlock.pbm: New file.
* etc/images/gnus/important.pbm: New file.
* etc/images/gnus/mail-send.pbm: New file.
* etc/images/gnus/receipt.pbm: New file.
* etc/images/gnus/toggle-subscription.pbm: New file.
* etc/images/gnus/unimportant.pbm: New file.
* etc/images/gud/all.pbm: New file.
* etc/images/gud/rcont.pbm: New file.
* etc/images/gud/recstart.pbm: New file.
* etc/images/gud/recstop.pbm: New file.
* etc/images/gud/rfinish.pbm: New file.
* etc/images/gud/rnext.pbm: New file.
* etc/images/gud/rnexti.pbm: New file.
* etc/images/gud/rstep.pbm: New file.
* etc/images/gud/rstepi.pbm: New file.
* etc/images/gud/thread.pbm: New file.
* etc/images/lock-broken.pbm: New file.
* etc/images/lock-ok.pbm: New file.
* etc/images/lock.pbm: New file.
* etc/images/mail/copy.pbm: New file.
* etc/images/mail/forward.pbm: New file.
* etc/images/mail/not-spam.pbm: New file.
* etc/images/mail/outbox.pbm: New file.
* etc/images/mail/preview.pbm: New file.
* etc/images/mail/save-draft.pbm: New file.
* etc/images/mh-logo.pbm: New file.
* etc/images/mpc/add.pbm: New file.
* etc/images/mpc/ffwd.pbm: New file.
* etc/images/mpc/next.pbm: New file.
* etc/images/mpc/pause.pbm: New file.
* etc/images/mpc/play.pbm: New file.
* etc/images/mpc/prev.pbm: New file.
* etc/images/mpc/rewind.pbm: New file.
* etc/images/mpc/stop.pbm: New file.
* etc/images/redo.pbm: New file.
* etc/images/smilies/braindamaged.pbm: New file.
* etc/images/smilies/cry.pbm: New file.
* etc/images/smilies/dead.pbm: New file.
* etc/images/smilies/evil.pbm: New file.
* etc/images/smilies/forced.pbm: New file.
* etc/images/smilies/grin.pbm: New file.
* etc/images/smilies/indifferent.pbm: New file.
* etc/images/sort-ascending.pbm: New file.
* etc/images/sort-column-ascending.pbm: New file.
* etc/images/sort-criteria.pbm: New file.
* etc/images/sort-descending.pbm: New file.
* etc/images/sort-row-ascending.pbm: New file.
* etc/images/unchecked.pbm: New file.
* etc/images/zoom-in.pbm: New file.
*: New file.
: New file.
: New file.
* Please enter the commit message for your changes. Lines starting: New file.
* with '#' will be ignored, and an empty message aborts the commit.: New file.
* On branch master: New file.
* Your branch is up-to-date with 'origin/master'.: New file.
*: New file.
* Changes to be committed:: New file.
* modified:   etc/images/README: New file.
* etc/images/connect.pbm: New file.
* etc/images/custom/down-pushed.pbm: New file.
* etc/images/custom/down.pbm: New file.
* etc/images/custom/right-pushed.pbm: New file.
* etc/images/custom/right.pbm: New file.
* etc/images/describe.pbm: New file.
* etc/images/disconnect.pbm: New file.
* etc/images/ezimage/bits.pbm: New file.
* etc/images/ezimage/bitsbang.pbm: New file.
* etc/images/ezimage/box-minus.pbm: New file.
* etc/images/ezimage/box-plus.pbm: New file.
* etc/images/ezimage/box.pbm: New file.
* etc/images/ezimage/checkmark.pbm: New file.
* etc/images/ezimage/dir-minus.pbm: New file.
* etc/images/ezimage/dir-plus.pbm: New file.
* etc/images/ezimage/dir.pbm: New file.
* etc/images/ezimage/doc-minus.pbm: New file.
* etc/images/ezimage/doc-plus.pbm: New file.
* etc/images/ezimage/doc.pbm: New file.
* etc/images/ezimage/info.pbm: New file.
* etc/images/ezimage/key.pbm: New file.
* etc/images/ezimage/label.pbm: New file.
* etc/images/ezimage/lock.pbm: New file.
* etc/images/ezimage/mail.pbm: New file.
* etc/images/ezimage/page-minus.pbm: New file.
* etc/images/ezimage/page-plus.pbm: New file.
* etc/images/ezimage/page.pbm: New file.
* etc/images/ezimage/tag-gt.pbm: New file.
* etc/images/ezimage/tag-minus.pbm: New file.
* etc/images/ezimage/tag-plus.pbm: New file.
* etc/images/ezimage/tag-type.pbm: New file.
* etc/images/ezimage/tag-v.pbm: New file.
* etc/images/ezimage/tag.pbm: New file.
* etc/images/ezimage/unlock.pbm: New file.
* etc/images/gnus/important.pbm: New file.
* etc/images/gnus/mail-send.pbm: New file.
* etc/images/gnus/receipt.pbm: New file.
* etc/images/gnus/toggle-subscription.pbm: New file.
* etc/images/gnus/unimportant.pbm: New file.
* etc/images/gud/all.pbm: New file.
* etc/images/gud/rcont.pbm: New file.
* etc/images/gud/recstart.pbm: New file.
* etc/images/gud/recstop.pbm: New file.
* etc/images/gud/rfinish.pbm: New file.
* etc/images/gud/rnext.pbm: New file.
* etc/images/gud/rnexti.pbm: New file.
* etc/images/gud/rstep.pbm: New file.
* etc/images/gud/rstepi.pbm: New file.
* etc/images/gud/thread.pbm: New file.
* etc/images/lock-broken.pbm: New file.
* etc/images/lock-ok.pbm: New file.
* etc/images/lock.pbm: New file.
* etc/images/mail/copy.pbm: New file.
* etc/images/mail/forward.pbm: New file.
* etc/images/mail/not-spam.pbm: New file.
* etc/images/mail/outbox.pbm: New file.
* etc/images/mail/preview.pbm: New file.
* etc/images/mail/save-draft.pbm: New file.
* etc/images/mh-logo.pbm: New file.
* etc/images/mpc/add.pbm: New file.
* etc/images/mpc/ffwd.pbm: New file.
* etc/images/mpc/next.pbm: New file.
* etc/images/mpc/pause.pbm: New file.
* etc/images/mpc/play.pbm: New file.
* etc/images/mpc/prev.pbm: New file.
* etc/images/mpc/rewind.pbm: New file.
* etc/images/mpc/stop.pbm: New file.
* etc/images/redo.pbm: New file.
* etc/images/smilies/braindamaged.pbm: New file.
* etc/images/smilies/cry.pbm: New file.
* etc/images/smilies/dead.pbm: New file.
* etc/images/smilies/evil.pbm: New file.
* etc/images/smilies/forced.pbm: New file.
* etc/images/smilies/grin.pbm: New file.
* etc/images/smilies/indifferent.pbm: New file.
* etc/images/sort-ascending.pbm: New file.
* etc/images/sort-column-ascending.pbm: New file.
* etc/images/sort-criteria.pbm: New file.
* etc/images/sort-descending.pbm: New file.
* etc/images/sort-row-ascending.pbm: New file.
* etc/images/unchecked.pbm: New file.
* etc/images/zoom-in.pbm: New file.
* etc/images/README: Update instructions for PBM files.

Add separator.pbm tool-bar image

* etc/images/separator.pbm: New file.  Having it avoids the side
effect of changing the tool-bar height when the default font's size
changes and XPM image support is not available, due to the SPC
characters that are left in the Lisp string used to display the tool
bar, because there are no images to display instead of those SPC
characters.

Make show-paren-match face visible on mono-color displays

* lisp/faces.el (show-paren-match): Use the underline face for
mono-color displays.  (Bug#21481)