]> code.delx.au - gnu-emacs/log
gnu-emacs
8 years ago; Merge from origin/emacs-25
Paul Eggert [Tue, 22 Mar 2016 18:04:36 +0000 (11:04 -0700)]
; Merge from origin/emacs-25

The following commits were skipped:

8a35f83 Render empty <ul><li><ul> correctly
d8b2ce5 Ignore invalid base64 encoded embedded images
52ba24b Fix <p> and <div> newlines with or without <li> in shr

8 years ago-
Paul Eggert [Tue, 22 Mar 2016 18:04:36 +0000 (11:04 -0700)]
-

8 years ago; Merge from origin/emacs-25
Paul Eggert [Tue, 22 Mar 2016 18:01:30 +0000 (11:01 -0700)]
; Merge from origin/emacs-25

The following commit was skipped:

9ab03f2 ; Auto-commit of loaddefs files.

8 years ago-
Paul Eggert [Tue, 22 Mar 2016 18:01:30 +0000 (11:01 -0700)]
-

8 years agoKeep "merge" commits by default in gitmerge
Paul Eggert [Tue, 22 Mar 2016 17:52:54 +0000 (10:52 -0700)]
Keep "merge" commits by default in gitmerge

* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives.  See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html

8 years agoAssume NON_BLOCKING_CONNECT (Bug#22946)
Paul Eggert [Tue, 22 Mar 2016 08:17:56 +0000 (01:17 -0700)]
Assume NON_BLOCKING_CONNECT (Bug#22946)

* lisp/proced.el (proced-signal-list): Omit comment about
obsolete systems that do not support POSIX 1003.1-2001 signals.
* src/process.c (NON_BLOCKING_CONNECT): Remove, since we can now
assume POSIX 1003.1-2001 or better here.  Assume it’s defined.
(connect_network_socket): Assume EINPROGRESS is defined,
as that’s portable too now.
(Fmake_network_process): Use bool for boolean.

8 years agoFix problems caused by new implementation of sub-word mode
Eli Zaretskii [Tue, 22 Mar 2016 00:42:35 +0000 (17:42 -0700)]
Fix problems caused by new implementation of sub-word mode

* lisp/subr.el (forward-word-strictly, backward-word-strictly):
New functions.
(word-move-empty-char-table): New variable.

* etc/NEWS: Mention 'forward-word-strictly' and
'backward-word-strictly'.

* doc/lispref/positions.texi (Word Motion): Document
'find-word-boundary-function-table', 'forward-word-strictly', and
'backward-word-strictly'.  (Bug#22560)

* src/syntax.c (syms_of_syntax)
<find-word-boundary-function-table>: Doc fix.

* lisp/wdired.el (wdired-xcase-word):
* lisp/textmodes/texnfo-upd.el (texinfo-copy-node-name)
(texinfo-copy-section-title, texinfo-start-menu-description)
(texinfo-copy-menu-title, texinfo-specific-section-type)
(texinfo-insert-node-lines, texinfo-copy-next-section-title):
* lisp/textmodes/texinfo.el (texinfo-clone-environment)
(texinfo-insert-@end):
* lisp/textmodes/texinfmt.el (texinfo-format-scan)
(texinfo-anchor, texinfo-multitable-widths)
(texinfo-multitable-item):
* lisp/textmodes/tex-mode.el (latex-env-before-change):
* lisp/textmodes/flyspell.el (texinfo-mode-flyspell-verify):
* lisp/skeleton.el (skeleton-insert):
* lisp/simple.el (count-words):
* lisp/progmodes/vhdl-mode.el (vhdl-beginning-of-libunit)
(vhdl-beginning-of-defun, vhdl-beginning-of-statement-1)
(vhdl-update-sensitivity-list, vhdl-template-block)
(vhdl-template-break, vhdl-template-case, vhdl-template-default)
(vhdl-template-default-indent, vhdl-template-for-loop)
(vhdl-template-if-then-use, vhdl-template-bare-loop)
(vhdl-template-nature, vhdl-template-procedural)
(vhdl-template-process, vhdl-template-selected-signal-asst)
(vhdl-template-type, vhdl-template-variable)
(vhdl-template-while-loop, vhdl-beginning-of-block)
(vhdl-hooked-abbrev, vhdl-port-copy, vhdl-hs-forward-sexp-func):
* lisp/progmodes/verilog-mode.el (verilog-backward-sexp)
(verilog-forward-sexp, verilog-beg-of-statement)
(verilog-set-auto-endcomments, verilog-backward-token)
(verilog-do-indent):
* lisp/progmodes/vera-mode.el (vera-guess-basic-syntax)
(vera-indent-block-closing):
* lisp/progmodes/simula.el (simula-context)
(simula-backward-up-level, simula-forward-down-level)
(simula-previous-statement, simula-next-statement)
(simula-skip-comment-backward, simula-calculate-indent)
(simula-find-if, simula-electric-keyword):
* lisp/progmodes/sh-script.el (sh-smie--rc-newline-semi-p):
* lisp/progmodes/ruby-mode.el (ruby-smie--redundant-do-p)
(ruby-smie--forward-token, ruby-smie--backward-token)
(ruby-singleton-class-p, ruby-calculate-indent)
(ruby-forward-sexp, ruby-backward-sexp):
* lisp/progmodes/ps-mode.el (ps-run-goto-error):
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function)
(perl-syntax-propertize-special-constructs)
(perl-backward-to-start-of-continued-exp):
* lisp/progmodes/pascal.el (pascal-indent-declaration):
* lisp/progmodes/octave.el (octave-function-file-p):
* lisp/progmodes/mantemp.el (mantemp-insert-cxx-syntax):
* lisp/progmodes/js.el (js--forward-function-decl):
* lisp/progmodes/idlwave.el (idlwave-show-begin-check)
(idlwave-beginning-of-block, idlwave-end-of-block)
(idlwave-block-jump-out, idlwave-determine-class):
* lisp/progmodes/icon.el (icon-is-continuation-line)
(icon-backward-to-start-of-continued-exp, end-of-icon-defun):
* lisp/progmodes/hideif.el (hide-ifdef-define):
* lisp/progmodes/f90.el (f90-change-keywords):
* lisp/progmodes/cperl-mode.el (cperl-electric-pod)
(cperl-linefeed, cperl-electric-terminator)
(cperl-find-pods-heres, cperl-fix-line-spacing)
(cperl-invert-if-unless):
* lisp/progmodes/cc-engine.el (c-forward-<>-arglist-recur):
* lisp/progmodes/cc-align.el (c-lineup-java-inher):
* lisp/progmodes/ada-mode.el (ada-compile-goto-error)
(ada-adjust-case-skeleton, ada-create-case-exception)
(ada-create-case-exception-substring)
(ada-case-read-exceptions-from-file, ada-after-keyword-p)
(ada-scan-paramlist, ada-get-current-indent, ada-get-indent-end)
(ada-get-indent-if, ada-get-indent-block-start)
(ada-get-indent-loop, ada-get-indent-type)
(ada-search-prev-end-stmt, ada-check-defun-name)
(ada-goto-decl-start, ada-goto-matching-start)
(ada-goto-matching-end, ada-looking-at-semi-or)
(ada-looking-at-semi-private, ada-in-paramlist-p)
(ada-search-ignore-complex-boolean, ada-move-to-start)
(ada-move-to-end, ada-which-function, ada-gen-treat-proc):
* lisp/net/quickurl.el (quickurl-grab-url):
* lisp/mail/sendmail.el (mail-do-fcc):
* lisp/mail/rmail.el (rmail-resend):
* lisp/mail/mailabbrev.el (mail-abbrev-complete-alias):
* lisp/mail/mail-extr.el (mail-extract-address-components):
* lisp/json.el (json-read-keyword):
* lisp/files.el (insert-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* lisp/completion.el (symbol-under-point, symbol-before-point)
(symbol-before-point-for-complete, next-cdabbrev)
(add-completions-from-c-buffer):
* lisp/cedet/semantic/texi.el (semantic-up-context)
(semantic-beginning-of-context):
* lisp/cedet/semantic/bovine/el.el (semantic-get-local-variables):
use 'forward-word-strictly' and 'backward-word-strictly' instead
of 'forward-word' and 'backward-word'.

[This reapplies commit c1d32a65372c72d7de4808d620eefd3214a8e92a,
which was inadvertently lost by merge commit
c71e7cc113ed0d5f01aaa2e441a3e3c9fbeb9fa5.]

8 years ago* etc/TODO: Minor quoting and grammar fixes.
Paul Eggert [Tue, 22 Mar 2016 00:32:12 +0000 (17:32 -0700)]
* etc/TODO: Minor quoting and grammar fixes.

[This reapplies commit 433407d8230a8a256b26c6c7615d3921b43f59ce,
which was inadvertently lost by merge commit
5ab243f40e4db91586ff74b01a775a5218a1d5be.]

8 years agoDon't confuse "::" with ":" when trying to parse member initializers.
Alan Mackenzie [Fri, 15 Jan 2016 21:15:20 +0000 (21:15 +0000)]
Don't confuse "::" with ":" when trying to parse member initializers.

* lisp/progmodes/cc-engine.el (c-back-over-member-initializers): Check
more robustly for ":" token when searching backwards for it.

* lisp/progmodes/cc-langs (c-:$-multichar-token-regexp): New language
variable.

[This reapplies commit 9e5452f7166e3634f2d8e943815ed722e1672714,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]

8 years agoEnsure positive number of glyphs for margins of positive width
Eli Zaretskii [Fri, 15 Jan 2016 15:36:47 +0000 (17:36 +0200)]
Ensure positive number of glyphs for margins of positive width

* src/dispnew.c (margin_glyphs_to_reserve): Always return a
positive value when a non-zero width of the marginal area was
requested.  (Bug#22356)

[This reapplies commit 740849fe986b62a839bce4bbf67d0036fc1be0b9,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]

8 years agoIn comment-dwim with style `extra-line', respect indent-tabs-mode.
Alan Mackenzie [Fri, 15 Jan 2016 12:32:32 +0000 (12:32 +0000)]
In comment-dwim with style `extra-line', respect indent-tabs-mode.

This fixes bug #22369.

* lisp/newcomment.el (comment-make-bol-ws): New function.
(comment-make-extra-lines): Use new function instead of a crude `make-string'.

[This reapplies commit 016b3d5894b8c424eab262aeefc646c6cd03a70a,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]

8 years agoMerge doc fixes for 'random' lost in previous merge
Eli Zaretskii [Fri, 15 Jan 2016 09:47:55 +0000 (11:47 +0200)]
Merge doc fixes for 'random' lost in previous merge

[This reapplies part of commit
3ffe81e245d854a694ae1734f1b6a995bdc5e724,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]
(Bug#22202)

8 years agoUnhide the --no-line-directive option to 'etags'
Eli Zaretskii [Fri, 15 Jan 2016 08:54:03 +0000 (10:54 +0200)]
Unhide the --no-line-directive option to 'etags'

* lib-src/etags.c (print_help): Un-undocument the --no-line-directive
option.  (Bug#22306)

* doc/man/etags.1: Document the --no-line-directive option.

[This reapplies commit fee0526a189f43e8470d78e8374bd425890fbe6f,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]

8 years agoFix picture-mode wrt double-width characters
Alan J Third [Fri, 15 Jan 2016 08:26:10 +0000 (10:26 +0200)]
Fix picture-mode wrt double-width characters

* lisp/textmodes/picture.el (picture-insert): Check the width of
the character being replaced, not just that of the replacement.
(Bug#1808)

[This reapplies commit b70dba4e18514411ed38b5bbb846558158842ace,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]

Copyright-paperwork-exempt: yes

8 years ago; * etc/NEWS: Remove unneeded text.
Eli Zaretskii [Fri, 15 Jan 2016 08:14:30 +0000 (10:14 +0200)]
; * etc/NEWS: Remove unneeded text.

[This reapplies commit 2bc07f7a2a4fb96b470576567a18240f363b4a3b,
which was inadvertently lost by merge commit
7823745acbe9b87eea2db4ef434e379fc903ec35.]

8 years agoResurrect earlier fix of resize_frame_windows
Martin Rudalics [Sun, 20 Mar 2016 15:52:39 +0000 (16:52 +0100)]
Resurrect earlier fix of resize_frame_windows

* src/window.c (resize_frame_windows): Resurrect earlier fix for
calculating the number of columns of the minibuffer window which
was lost in subsequent merges.

8 years agoMove the cert files to the data directory
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 15:08:55 +0000 (16:08 +0100)]
Move the cert files to the data directory

8 years agoFurther empty <li> tweaks
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 14:15:32 +0000 (15:15 +0100)]
Further empty <li> tweaks

* lisp/net/shr.el (shr-tag-li): When showing several empty
<li> elements, ensure that they really get inserted on a new line.

8 years agoDon't remove too much white space at the end of documents
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 13:47:22 +0000 (14:47 +0100)]
Don't remove too much white space at the end of documents

* lisp/net/shr.el (shr--remove-blank-lines-at-the-end): Don't
remove too much white space -- leave it on the last line (in
case there's a background color).

8 years agoAmend parse-partial-sexp correctly to handle two character comment delimiters
Alan Mackenzie [Sun, 20 Mar 2016 13:19:48 +0000 (13:19 +0000)]
Amend parse-partial-sexp correctly to handle two character comment delimiters

Do this by adding a new field to the parser state: the syntax of the last
character scanned, should that be the first char of a (potential) two char
construct, nil otherwise.
This should make the parser state complete.
Also document element 9 of the parser state.  Also refactor the code a bit.

* src/syntax.c (struct lisp_parse_state): Add a new field.
(SYNTAX_FLAGS_COMSTARTEND_FIRST): New function.
(internalize_parse_state): New function, extracted from scan_sexps_forward.
(back_comment): Call internalize_parse_state.
(forw_comment): Return the syntax of the last character scanned to the caller
when that character might be the first of a two character construct.
(Fforward_comment, scan_lists): New dummy variables, passed to forw_comment.
(scan_sexps_forward): Remove a redundant state parameter.  Access all `state'
information via the address parameter `state'.  Remove the code which converts
from external to internal form of `state'.  Access buffer contents only from
`from' onwards.  Reformulate code at the top of the main loop correctly to
recognize comment openers when starting in the middle of one.  Call
forw_comment with extra argument (for return of syntax value of possible first
char of a two char construct).
(Fparse_partial_sexp): Document elements 9, 10 of the parser state in the
doc string.  Clarify the doc string in general.  Call
internalize_parse_state.  Take account of the new elements when consing up the
output parser state.

* doc/lispref/syntax.texi: (Parser State): Document element 9 and the new
element 10.  Minor wording corrections (remove reference to "trivial
cases").
(Low Level Parsing): Minor corrections.

* etc/NEWS: Note new element 10, and documentation of element 9 of parser
state.

8 years agoAllow the shr test files to have trailing blank space.
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 13:07:47 +0000 (14:07 +0100)]
Allow the shr test files to have trailing blank space.

* .gitattributes: Allow the shr test files to have trailing
blank space.

8 years agoAdd tests for empty <ul><li>
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 13:07:24 +0000 (14:07 +0100)]
Add tests for empty <ul><li>

8 years agoRender empty <ul><li><ul> correctly
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:52:36 +0000 (13:52 +0100)]
Render empty <ul><li><ul> correctly

* lisp/net/shr.el (shr-tag-ul): Render empty <ul><li><ul>
correctly (bug#22964).
(cherry picked from commit 4f6ea3988b66cf132c67fd0cc26d12eb9a300ba1)

Backport:

8 years ago* src/alloc.c (purecopy): Use AUTO_STRING.
Paul Eggert [Sun, 20 Mar 2016 12:56:42 +0000 (05:56 -0700)]
* src/alloc.c (purecopy): Use AUTO_STRING.

8 years agoIgnore invalid base64 encoded embedded images
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:57:11 +0000 (13:57 +0100)]
Ignore invalid base64 encoded embedded images

* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64
encoded embedded images (bug#22928).
(cherry picked from commit f2da80d0e1ccd121c4891e869a45aeb9c6b1795d)

Backport:

8 years agoIgnore invalid base64 encoded embedded images
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:57:11 +0000 (13:57 +0100)]
Ignore invalid base64 encoded embedded images

* lisp/net/shr.el (shr-image-from-data): Ignore invalid base64
encoded embedded images (bug#22928).

8 years agoRender empty <ul><li><ul> correctly
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:52:36 +0000 (13:52 +0100)]
Render empty <ul><li><ul> correctly

* lisp/net/shr.el (shr-tag-ul): Render empty <ul><li><ul>
correctly (bug#22964).

8 years agoFix <p> and <div> newlines with or without <li> in shr
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:43:42 +0000 (13:43 +0100)]
Fix <p> and <div> newlines with or without <li> in shr

* lisp/net/shr.el (shr-ensure-newline): Respect that we're in
a <li>, if we are, and don't insert newlines there.
(shr-ensure-paragraph): When mixing newlines and paragraph
ensurements, don't insert too many blank lines.
(shr-tag-div): A <div> shouldn't introduce a paragraph, but a
new line.
(cherry picked from commit 292921facaff2f02ac4e8602c1f7ecbdcfe7ef45)

Backport:

8 years agoFix <p> and <div> newlines with or without <li> in shr
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:43:42 +0000 (13:43 +0100)]
Fix <p> and <div> newlines with or without <li> in shr

* lisp/net/shr.el (shr-ensure-newline): Respect that we're in
a <li>, if we are, and don't insert newlines there.
(shr-ensure-paragraph): When mixing newlines and paragraph
ensurements, don't insert too many blank lines.
(shr-tag-div): A <div> shouldn't introduce a paragraph, but a
new line.

8 years agoAdd more shr HTML rendering tests
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 12:41:59 +0000 (13:41 +0100)]
Add more shr HTML rendering tests

8 years agoAdd a test harness for shr HTML rendering and one test
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 11:55:36 +0000 (12:55 +0100)]
Add a test harness for shr HTML rendering and one test

8 years agoRemove code left over from when overlays were used for padding
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 11:54:24 +0000 (12:54 +0100)]
Remove code left over from when overlays were used for padding

* lisp/net/shr.el (shr-previous-newline-padding-width): Remove.
(shr-remove-trailing-whitespace): Ditto.
(shr-insert-document): Don't call them.

8 years agoRemove trailing blank lines in shr
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 11:52:28 +0000 (12:52 +0100)]
Remove trailing blank lines in shr

* lisp/net/shr.el (shr--remove-blank-lines-at-the-end): New function.
(shr-insert-document): Use it to remove trailing blank lines
at the end of documents, since these never seem to be very useful.

8 years agoDon't bug out on nil `patch-buf' arguments
Lars Magne Ingebrigtsen [Sun, 20 Mar 2016 11:12:27 +0000 (12:12 +0100)]
Don't bug out on nil `patch-buf' arguments

* lisp/vc/ediff.el (ediff-patch-file): Don't bug out on nil
`patch-buf' arguments.

8 years agoAdd a Catalan language environment
Ernest Adrogué [Sun, 20 Mar 2016 11:01:23 +0000 (12:01 +0100)]
Add a Catalan language environment

* international/mule-cmds.el (locale-language-names): Map locale
  language name `ca' to language environment `Catalan'.

* language/european.el: Add definition of language environment for
  the Catalan language.

* leim/quail/latin-pre.el: Add quail rule to the `catalan-prefix'
  input method to support input of middle dot characters through
  composition (bug#18279).

8 years agoNo need to block input when reading directories
Paul Eggert [Sun, 20 Mar 2016 01:44:15 +0000 (18:44 -0700)]
No need to block input when reading directories

* src/dired.c: Don’t include blockinput.h.
(open_directory, directory_files_internal_unwind)
(directory_files_internal, file_attributes):
Don’t block input here, as the reasons for blocking input should
no longer apply.  See blockinput.h FIXME.  (Bug#22996).

8 years agoAvoid errors in 'newline'
Eli Zaretskii [Sat, 19 Mar 2016 19:32:27 +0000 (21:32 +0200)]
Avoid errors in 'newline'

* lisp/simple.el (newline): Don't barf if invoked with
non-positive argument in the middle of a line.  (Bug#22490)

8 years ago* lisp/vc/vc-hooks.el: Fix typo
Oscar Fuentes [Sat, 19 Mar 2016 17:56:51 +0000 (18:56 +0100)]
* lisp/vc/vc-hooks.el: Fix typo

8 years agoFix Bug#23032
Michael Albinus [Sat, 19 Mar 2016 15:51:46 +0000 (16:51 +0100)]
Fix Bug#23032

* doc/misc/eshell.texi (Arguments): Mention the pipe symbol in
remote file names.  (Bug#23032)

8 years agoImprove w32notify notifications
Fabrice Popineau [Sat, 19 Mar 2016 12:44:53 +0000 (14:44 +0200)]
Improve w32notify notifications

* src/w32notify.c (DIRWATCH_BUFFER_SIZE): New macro.
(struct notification): 'terminate' is now a HANDLE.
(send_notifications): Argument is now a pointer to a
notification.  Don't loop waiting for the notification to be
acknowledged by the main thread; instead, just add the
notification to the linked list of notifications waiting to be
acknowledged.
(watch_end): Don't close the directory handle.
(watch_completion): Allocate a new notification structure to be
added to the notifications set.  Call ReadDirectoryChangesW
immediately after adding the new notification, and before sending
a message to the main thread about them.
(watch_worker): Don't loop calling ReadDirectoryChangesW; instead,
call it just once -- it will be called again in watch_completion.
Loop waiting for the main thread's indication to terminate.
(start_watching): Create the event to be used to indicate to the
worker thread that its should terminate.
(remove_watch): Indicate to the worker thread that it should
terminate.
* src/w32term.c (queue_notifications): Loop over all the
notifications in the linked list, processing all of them in one
go.
* src/w32inevt.c (handle_file_notifications): Loop over all the
notifications in the linked list.
* src/w32xfns.c (init_crit): Initialize the linked list of file
notifications.
(delete_crit): Free the linked list of file notifications,
including any unprocessed notifications left in it.
* src/w32term.h (struct notifications_se): New struct.

* test/lisp/filenotify-tests.el (file-notify-test02-events)
(file-notify-test05-dir-validity): Add read-event calls to
facilitate event recognition by the main thread in batch mode.

8 years agoAdjudicate review comments in abbrevs.texi
Eli Zaretskii [Sat, 19 Mar 2016 11:05:55 +0000 (13:05 +0200)]
Adjudicate review comments in abbrevs.texi

* doc/lispref/abbrevs.texi (Abbrev Files, Abbrev Expansion):
* doc/emacs/abbrevs.texi (Dabbrev Customization): State the
default values of variables.  Suggested by Steve Byrne
<sbb@penguinis.org>.  (Bug#23016)

* admin/release-process (Check manuals): Mark files reviewed by
Steve Byrne.

8 years agoFixup the "normal" matcher; highlight global var symbols, too
Dmitry Gutov [Fri, 18 Mar 2016 22:37:09 +0000 (00:37 +0200)]
Fixup the "normal" matcher; highlight global var symbols, too

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
operator name symbols with the "normal" matcher (it actually
needed updating).  Highlight global variable symbols, too.

8 years ago; Small theme additions
Tassilo Horn [Fri, 18 Mar 2016 22:29:58 +0000 (23:29 +0100)]
; Small theme additions

8 years agoHonor prefix arg in doc-view-next-line-or-next-page
Marcin Borkowski [Mon, 14 Mar 2016 10:15:10 +0000 (11:15 +0100)]
Honor prefix arg in doc-view-next-line-or-next-page

* lisp/doc-view.el (doc-view-next-line-or-next-page): Take the
prefix argument into consideration when continuous scrolling is
not in effect (i.e., by default) (bug#19559).

8 years ago; Spelling fixes
Paul Eggert [Fri, 18 Mar 2016 15:54:49 +0000 (08:54 -0700)]
; Spelling fixes

8 years agoPort to strict C99 offsetof
Paul Eggert [Fri, 18 Mar 2016 15:42:15 +0000 (08:42 -0700)]
Port to strict C99 offsetof

* src/bidi.c (bidi_copy_it):
* src/lisp.h (CHAR_TABLE_EXTRA_SLOTS):
Use only a single identifier as the second argument of offsetof.
Found by using clang -pedantic.

8 years agoPort to GTK with strict C11 compiler
Paul Eggert [Fri, 18 Mar 2016 15:36:59 +0000 (08:36 -0700)]
Port to GTK with strict C11 compiler

* src/gtkutil.c (xg_create_frame_widgets, xg_toggle_notify_cb):
Cast from function type to void * where the C standard requires this.
This works around a problem in the prototypes for
g_signal_handler_find and g_signal_handlers_block_by_func, which
use gpointer instead of GCallback.  Found by using gcc -pedantic.

8 years agoPort to GTK with strict C99 compiler
Paul Eggert [Fri, 18 Mar 2016 06:45:02 +0000 (23:45 -0700)]
Port to GTK with strict C99 compiler

* src/emacsgtkfixed.c: Use workaround for GNOME bug 683906 only
in glib 2.35.6 and earlier, since the bug is fixed in 2.35.7.
* src/emacsgtkfixed.c (EmacsFixedPrivate):
* src/emacsgtkfixed.h (EmacsFixedClass):
Remove duplicate typedef, which strict C99 does not allow (Bug#23003).

8 years agoAvoid screen artifacts with new OS X visible bell after scrolling
Anders Lindgren [Thu, 17 Mar 2016 20:07:04 +0000 (21:07 +0100)]
Avoid screen artifacts with new OS X visible bell after scrolling

* src/nsterm.m (EmacsBell): Save NSView when displaying the
visible bell and set `needsDisplay' when removed.
(hide_bell): Trace.
(ns_copy_bits): Trace.

8 years agomake `vc-log-operation' buffer local to allow multiple simultaneous editing
Sam Steingold [Thu, 17 Mar 2016 19:42:15 +0000 (15:42 -0400)]
make `vc-log-operation' buffer local to allow multiple simultaneous editing

8 years agoMerge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
Michael Albinus [Thu, 17 Mar 2016 19:34:49 +0000 (20:34 +0100)]
Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25

8 years agoSuppress some Tramp tests for OSX, do not merge with master
Michael Albinus [Thu, 17 Mar 2016 19:33:51 +0000 (20:33 +0100)]
Suppress some Tramp tests for OSX, do not merge with master

* test/automated/tramp-tests.el (tramp--test-darwin-p): New defun.
(tramp--test-utf8): Use it.  (Bug#22145)

8 years ago* lisp/progmodes/xref.el (xref-buffer-name, xref--window):
Glenn Morris [Thu, 17 Mar 2016 16:55:09 +0000 (12:55 -0400)]
* lisp/progmodes/xref.el (xref-buffer-name, xref--window):
Move definitions before use.

8 years ago* lisp/gnus/mm-decode.el (gnus-format-message): Autoload it.
Glenn Morris [Thu, 17 Mar 2016 16:52:11 +0000 (12:52 -0400)]
* lisp/gnus/mm-decode.el (gnus-format-message): Autoload it.

; Do not merge to master.

8 years ago* lisp/mail/rmail.el (rmail-mime-entity-truncated): Declare.
Glenn Morris [Thu, 17 Mar 2016 16:04:51 +0000 (09:04 -0700)]
* lisp/mail/rmail.el (rmail-mime-entity-truncated): Declare.

8 years ago; Auto-commit of loaddefs files.
Glenn Morris [Thu, 17 Mar 2016 11:18:52 +0000 (07:18 -0400)]
; Auto-commit of loaddefs files.

8 years agoSimplify some rococo Gnus code that loads or tests for other libraries.
Glenn Morris [Thu, 17 Mar 2016 07:14:11 +0000 (00:14 -0700)]
Simplify some rococo Gnus code that loads or tests for other libraries.

* lisp/gnus/gnus-art.el (gnus-treat-ansi-sequences): Simplify default.
* lisp/gnus/mml-smime.el (epg): Simply require it.
(mml-smime-use): Simplify the default.  Doc fix.
* lisp/gnus/mml2015.el (epg-config): Require it.
(mml2015-use): Simplify the default.
* lisp/gnus/smime.el (password-cache): Simply require it.
(password-read-and-add): Remove declaration.

8 years agoAddress compilation warnings due to 2016-01-03 mml refactoring.
Glenn Morris [Thu, 17 Mar 2016 06:56:32 +0000 (23:56 -0700)]
Address compilation warnings due to 2016-01-03 mml refactoring.

* lisp/gnus/mml-sec.el (password-cache, mm-encode): Require.
(message-options-get): Autoload.
(message-options-set): Declare.
(mml-secure-cache-passphrase, mml-secure-passphrase-cache-expiry):
Simplify default value.
* lisp/gnus/mml-smime.el (message-options-set): Remove declaration.
* lisp/gnus/mml1991.el, lisp/gnus/mml2015.el:
No longer a need for password-cache.

8 years ago* lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp in strings
Stefan Monnier [Thu, 17 Mar 2016 02:55:56 +0000 (22:55 -0400)]
* lisp/emacs-lisp/smie.el (smie-indent-keyword): Don't burp in strings

(bug#22960).

8 years ago* lisp/dired-x.el (dired-omit-here-always): Correct error message
Glenn Morris [Wed, 16 Mar 2016 21:38:27 +0000 (17:38 -0400)]
* lisp/dired-x.el (dired-omit-here-always): Correct error message
for 2016-01-25 change.

8 years ago* lisp/dired-x.el (dired-omit-here-always): Replace undefined function
Glenn Morris [Wed, 16 Mar 2016 21:36:57 +0000 (17:36 -0400)]
* lisp/dired-x.el (dired-omit-here-always): Replace undefined function
removed 2016-01-30.

; Do not merge to master.

8 years ago* lisp/xml.el (xml-parse-tag-1): Replace undefined function.
Glenn Morris [Wed, 16 Mar 2016 21:24:36 +0000 (17:24 -0400)]
* lisp/xml.el (xml-parse-tag-1): Replace undefined function.

; string-empty-p is defined in subr-x, but this file does not load it.

8 years agoAvoid segfaults due to frame image cache being absent
Eli Zaretskii [Wed, 16 Mar 2016 17:04:16 +0000 (19:04 +0200)]
Avoid segfaults due to frame image cache being absent

* src/image.c (cache_image): If the frame doesn't have an image
cache, create it.  (Bug#23028)

8 years agoImprove documentation of glyphless-character display
Eli Zaretskii [Wed, 16 Mar 2016 16:57:46 +0000 (18:57 +0200)]
Improve documentation of glyphless-character display

* doc/emacs/display.texi (Text Display): Document and index the
'glyphless-char' face.

8 years ago; * src/xdisp.c (with_echo_area_buffer): Fix typos in comments.
Eli Zaretskii [Wed, 16 Mar 2016 16:52:36 +0000 (18:52 +0200)]
; * src/xdisp.c (with_echo_area_buffer): Fix typos in comments.

8 years ago* test/lisp/dabbrev-tests.el: Merge fix: move here from test/automated.
Glenn Morris [Wed, 16 Mar 2016 15:58:10 +0000 (08:58 -0700)]
* test/lisp/dabbrev-tests.el: Merge fix: move here from test/automated.

8 years agoSync with soap-client repository, version 3.1.1
Thomas Fitzsimmons [Wed, 16 Mar 2016 15:03:31 +0000 (11:03 -0400)]
Sync with soap-client repository, version 3.1.1

* lisp/net/soap-client.el (soap-encode-xs-complex-type): Fix error
message.
(soap-find-port): Delete trailing whitespace.
(soap-find-operation): Fix documentation and rename parameter.
(soap-find-port): Likewise.
(soap-operation-arity): Likewise.

* lisp/net/soap-client.el: Update copyright years.
(soap-warning): Fix docstring quoting.
(soap-decode-date-time): Likewise.
(soap-validate-xs-simple-type): Remove tabs for indentation.
* lisp/net/soap-inspect.el: Update copyright years.

* lisp/net/soap-client.el (soap-encode-xs-basic-type): Do not
assume xsd:base64Binary values are UTF-8 strings.
(soap-decode-xs-basic-type): Likewise.
(soap-invoke): Document xsd:base64Binary handling.

* lisp/net/soap-client.el (soap-find-port, soap-find-operation)
(soap-operation-arity): new defuns
(soap-invoke-internal): use soap-find-port, soap-find-operation.

Co-authored-by: Alex Harsanyi <AlexHarsanyi@gmail.com>
8 years agoSupport safe navigation operator in non-SMIE indentation code
Dmitry Gutov [Wed, 16 Mar 2016 13:58:21 +0000 (15:58 +0200)]
Support safe navigation operator in non-SMIE indentation code

* lisp/progmodes/ruby-mode.el (ruby-calculate-indent):
Support safe navigation operator in non-SMIE indentation code.
Cherry-picked from
https://github.com/ruby/ruby/commit/68e16ddd7961b86e5013e62ae2954e88638de058.

8 years agoMove xsd:base64Binary decoding fix to debbugs.el 0.9.1
Thomas Fitzsimmons [Wed, 16 Mar 2016 13:15:17 +0000 (09:15 -0400)]
Move xsd:base64Binary decoding fix to debbugs.el 0.9.1

* lisp/net/soap-client.el (soap-encode-xs-basic-type): Do not
assume xsd:base64Binary values are UTF-8 strings.
(soap-decode-xs-basic-type): Likewise.
(soap-invoke): Document xsd:base64Binary handling.

8 years agoFix Ruby's operator precedence
Dmitry Gutov [Wed, 16 Mar 2016 02:32:59 +0000 (04:32 +0200)]
Fix Ruby's operator precedence

* lisp/progmodes/ruby-mode.el (ruby-smie-grammar):
Rearrange the smie-precs->prec2 form.

8 years ago(ruby-interpolation-inside-another-interpolation): New failing test
Dmitry Gutov [Tue, 15 Mar 2016 23:48:10 +0000 (01:48 +0200)]
(ruby-interpolation-inside-another-interpolation): New failing test

* test/automated/ruby-mode-tests.el
(ruby-interpolation-inside-another-interpolation):
New failing test.

8 years agoMerge from gnulib
Paul Eggert [Tue, 15 Mar 2016 20:58:56 +0000 (13:58 -0700)]
Merge from gnulib

This incorporates:
2016-03-15 std-gnu11: improve clang support
* m4/std-gnu11.m4: Copy from gnulib.

8 years agoPort to clang 3.7.0 on x86-64
Paul Eggert [Tue, 15 Mar 2016 20:47:47 +0000 (13:47 -0700)]
Port to clang 3.7.0 on x86-64

* configure.ac: Use AS_IF so that gl_WARN_ADD’s prerequisites are
not done conditionally.  This helps clang, which needs
-Wunknown-warning-option later when configured with warnings.
* src/editfns.c (invalid_time): Now _Noreturn, since clang isn’t
smart enough to figure this out on its own if warnings are enabled.
(lisp_time_struct): Redo for clarity, and to pacify clang.
* src/xfns.c (x_real_pos_and_offsets) [USE_XCB]: Don’t use
uninitialized locals.  This avoids undefined behavior and pacifies
clang.

8 years ago* test/automated/package-test.el (package-test-signed): Tweak skip
Glenn Morris [Tue, 15 Mar 2016 20:24:26 +0000 (16:24 -0400)]
* test/automated/package-test.el (package-test-signed): Tweak skip
condition, for hydra.

8 years agoSync with gnulib
Paul Eggert [Tue, 15 Mar 2016 20:20:29 +0000 (13:20 -0700)]
Sync with gnulib

This incorporates:
2016-03-15 time_rz: port to clang -Wunused-const-variable
2016-03-15 select: port more to Intel 2016.1.150 compiler
* lib/sys_select.in.h, lib/time_rz.c: Copy from gnulib.

8 years agoFix startup of "emacs -nw" on systems that CANNOT_DUMP
Eli Zaretskii [Tue, 15 Mar 2016 17:46:26 +0000 (19:46 +0200)]
Fix startup of "emacs -nw" on systems that CANNOT_DUMP

* src/xdisp.c (syms_of_xdisp) <resize-mini-windows>: Initialize to
nil.

* lisp/loadup.el <resize-mini-windows>: Set to 'grow-only' after
loading window.el.  (Bug#22975)

8 years agoDo not tokenize a comment before continuation as ';'
Dmitry Gutov [Tue, 15 Mar 2016 01:15:18 +0000 (03:15 +0200)]
Do not tokenize a comment before continuation as ';'

* lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p):
Account for a comment right after point.

8 years agoDon't misindent arguments of a method call inside continuation
Dmitry Gutov [Tue, 15 Mar 2016 01:12:19 +0000 (03:12 +0200)]
Don't misindent arguments of a method call inside continuation

* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Use smie-indent-virtual instead of smie-rule-parent (bug#23015).
Simplify the traversal loop.

8 years ago* src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area
Stefan Monnier [Tue, 15 Mar 2016 00:52:34 +0000 (20:52 -0400)]
* src/keyboard.c (echo_keystrokes_p): Don't test cursor_in_echo_area

(read_key_sequence): Test it here, as before.
(bug#22825).

8 years agoASCII-only etc/NEWS etc.
Paul Eggert [Tue, 15 Mar 2016 00:36:23 +0000 (17:36 -0700)]
ASCII-only etc/NEWS etc.

* etc/NEWS, nextstep/README: Revert the recently-added curved
quotes, and stick to ASCII.  This typically involves replacing
curved with straight quotes.  Since etc/NEWS is viewed so often by
UTF-8-ignorant tools, rewrite its non-ASCII text to spell out
Unicode, e.g., replace ‘‒’ with ‘U+2012 (FIGURE DASH)’.

8 years agoFix a cacheing bug, which led to inordinately slow c-beginning-of-defun.
Alan Mackenzie [Mon, 14 Mar 2016 21:44:11 +0000 (21:44 +0000)]
Fix a cacheing bug, which led to inordinately slow c-beginning-of-defun.

* lisp/progmodes/cc-defs.el (c-self-bind-state-cache): New macro.

* lisp/progmodes/cc-engine.el (c-ssb-lit-begin): Always call c-parse-state
rather than just using the cache variable c-state-cache.
(c-syntactic-skip-backward): Invoke c-self-bind-state-cache to isolate calls
to c-parse-state from other uses of the parse state cache.

* lisp/progmodes/cc-cmds.el (c-beginning-of-defun, c-end-of-defun): Invoke
c-self-bind-state-cache around the processing, replacing flawed bindings of
c-state-cache.

8 years agoDisable MOVE more for Dovecot
Lars Magne Ingebrigtsen [Mon, 14 Mar 2016 19:23:30 +0000 (20:23 +0100)]
Disable MOVE more for Dovecot

* lisp/gnus/nnimap.el (nnimap-process-expiry-targets): Also
disable MOVE when expirying.
(nnimap-split-incoming-mail): And when splitting mail.

8 years agoDon't use MOVE on Dovecot
Lars Magne Ingebrigtsen [Mon, 14 Mar 2016 19:21:02 +0000 (20:21 +0100)]
Don't use MOVE on Dovecot

* lisp/gnus/nnimap.el (nnimap-request-move-article): Don't use
MOVE on Dovecot, since it's broken in many versions.
(nnimap-quirks): Mark MOVE on Dovecot as non-working.

8 years agoFix Isearch prompt when invoked with an argument
Kaushal Modi [Mon, 14 Mar 2016 18:15:17 +0000 (20:15 +0200)]
Fix Isearch prompt when invoked with an argument

* lisp/isearch.el (isearch--describe-regexp-mode): With
`search-default-mode' set to nil, if user does C-u C-s, the minibuffer
now displays "Regexp I-search: " again.  But if the user has set
`search-default-mode' to t, and then does C-s, the minibuffer now
displays "I-search: " because the default search mode is now regexp
mode.  Comments have been added to explain the priority of conditions
in the `cond' form.  (Bug#22991)

8 years agoFix a typo in the Emacs manual
Cesar Quiroz [Mon, 14 Mar 2016 17:45:29 +0000 (19:45 +0200)]
Fix a typo in the Emacs manual

* doc/emacs/maintaining.texi (VC Directory Commands): Fix a typo
in a command name.

Copyright-paperwork-exempt: yes

8 years agoCurved quotes in etc/NEWS etc.
Paul Eggert [Mon, 14 Mar 2016 16:30:01 +0000 (09:30 -0700)]
Curved quotes in etc/NEWS etc.

* etc/NEWS, nextstep/README: Prefer curved quotes in the
recently-changed text documentation.  See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg00860.html

8 years agoFix some single quotes in documentation
Paul Eggert [Mon, 14 Mar 2016 15:40:08 +0000 (08:40 -0700)]
Fix some single quotes in documentation

* doc/emacs/anti.texi (Antinews): Avoid confusion in info and PDF
when documenting quoting styles.
* etc/NEWS, nextstep/README: In these plain text files, quote
'like this' consistently, rather than also (sometimes) ‘like this’
or (more often) `like this'.

8 years agoMake lisp-completion-at-point's argument optional
Dmitry Gutov [Mon, 14 Mar 2016 02:14:05 +0000 (04:14 +0200)]
Make lisp-completion-at-point's argument optional

* lisp/progmodes/elisp-mode.el (lisp-completion-at-point): Make
the argument optional, like it was before the rename.

8 years agoTweak the left precedence of '=>'
Dmitry Gutov [Sun, 13 Mar 2016 22:34:01 +0000 (00:34 +0200)]
Tweak the left precedence of '=>'

* lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Tweak the left
precedence of '=>', to improve indentation and sexp navigation.

8 years agoIndent '.' relative to the first sibling expression
Dmitry Gutov [Sun, 13 Mar 2016 22:15:06 +0000 (00:15 +0200)]
Indent '.' relative to the first sibling expression

* lisp/progmodes/ruby-mode.el (ruby-smie-rules):
Indent '.' relative to the first sibling expression, instead of the
parent token (bug#17213).

8 years agoMake '.' associative, for easier sexp navigation
Dmitry Gutov [Sun, 13 Mar 2016 21:10:38 +0000 (23:10 +0200)]
Make '.' associative, for easier sexp navigation

* lisp/progmodes/ruby-mode.el (ruby-smie-grammar):
Make '.' associative, for easier sexp navigation.

8 years agoImprove diff hunk headers when maintaining Emacs
Paul Eggert [Sun, 13 Mar 2016 19:20:01 +0000 (12:20 -0700)]
Improve diff hunk headers when maintaining Emacs

* .gitattributes: Improve diff hunk header support for makefiles,
shell scripts, Ada, C, C++, Objective C, HTML, SHTML, XML, Java,
Perl, PHP, Python, Ruby, and TeX, all of which are used in Emacs
somewhere (sometimes just in test cases).
* autogen.sh: Add regexes for makefiles and shell scripts.

8 years agoRevert "Simplify "Visit New File" to "New File""
Phillip Lord [Sun, 13 Mar 2016 18:33:10 +0000 (18:33 +0000)]
Revert "Simplify "Visit New File" to "New File""

This reverts commit d457fd9dc782465e1547f74021390c9d5951d6af.

8 years agoSimplify "Visit New File" to "New File"
Phillip Lord [Sat, 12 Mar 2016 22:26:20 +0000 (22:26 +0000)]
Simplify "Visit New File" to "New File"

* doc/emacs/files.texi,lisp/menu-bar.el (menu-bar-file-menu),
  lisp/startup.el(normal-mouse-start-screen,
  normal-no-mouse-startup-screen): Change label "Visit New File" to "New
  File".

8 years agoUpdate handling of <bdo> per Unicode 9.0
Eli Zaretskii [Sat, 12 Mar 2016 16:35:26 +0000 (18:35 +0200)]
Update handling of <bdo> per Unicode 9.0

* lisp/net/shr.el (shr-tag-bdo): Wrap in FSI..PDI as well, per
Unicode 9.0 changes in UAX#9, paragraph 2.7.

8 years agoUpdate Unicode notes for importing a new Unicode version
Eli Zaretskii [Sat, 12 Mar 2016 16:07:34 +0000 (18:07 +0200)]
Update Unicode notes for importing a new Unicode version

* admin/notes/unicode: Mention the need to update otf-script-alist
in fontset.el when importing data files from a new Unicode
version.

8 years agoImport new data files from Unicode 9.0.0beta
Eli Zaretskii [Sat, 12 Mar 2016 15:51:45 +0000 (17:51 +0200)]
Import new data files from Unicode 9.0.0beta

* admin/unidata/UnicodeData.txt:
* admin/unidata/Blocks.txt:
* admin/unidata/BidiMirroring.txt:
* admin/unidata/BidiBrackets.txt: Update from Unicode 9.0.0beta.
* admin/unidata/unidata-gen.el (unidata-gen-files): Bind
'coding-system-for-read' to 'utf-8, as various Unicode data files
now actually use non-ASCII characters.
(unidata-setup-list, unidata-get-name): Support the new Tangut
Ideographs block.

* lisp/international/characters.el (standard-case-table): Add new
characters from Unicode 9.0.0.
(standard-category-table): Add Arabic block u+08A0..u+08FF.  Add
Cyrillic Extended-C block.
(char-width-table): Update ranges per Unicode 9.0.0.
* lisp/international/fontset.el (script-representative-chars): Add
new scripts defined by Unicode 9.0.0.
(otf-script-alist): Add new OTF script tags.
* lisp/international/mule-cmds.el (ucs-names): Update ranges per
Unicode 9.0.0 additions.

8 years agoAvoid errors in forms-mode when default major mode is text
Eli Zaretskii [Sat, 12 Mar 2016 11:05:49 +0000 (13:05 +0200)]
Avoid errors in forms-mode when default major mode is text

* lisp/forms.el (forms-mode): Bind
change-major-mode-with-file-name to nil when calling
set-visited-file-name.  (Bug#22982)

8 years agoAvoid crashes at startup on systems that CANNOT_DUMP
Eli Zaretskii [Sat, 12 Mar 2016 09:51:03 +0000 (11:51 +0200)]
Avoid crashes at startup on systems that CANNOT_DUMP

* src/xdisp.c (syms_of_xdisp) <redisplay--inhibit-bidi>: New
boolean variable.
(init_iterator, reseat_to_string)
(Fcurrent_bidi_paragraph_direction)
(Fbidi_find_overridden_directionality): Use
redisplay--inhibit-bidi instead of purify-flag, to determine when
it's safe to reorder bidirectional text.

* lisp/loadup.el (redisplay--inhibit-bidi): Set to t at the
beginning of the file.  Reset to nil when charprop.el is
successfully loaded, or when we are going to dump, whichever
happens last.  (Bug#22975)

8 years ago; * etc/DEBUG: Improve wording. (Bug#22984)
Eli Zaretskii [Sat, 12 Mar 2016 08:32:16 +0000 (10:32 +0200)]
; * etc/DEBUG: Improve wording.  (Bug#22984)