1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-12 14:30:42 -08:00
Commit graph

131568 commits

Author SHA1 Message Date
Philipp Stephani
c5f9d47ba4 Fix bugs in JSON test
* test/src/json-tests.el (json-serialize/invalid-unicode): Fix two
bugs that canceled each other out.  "a\xCCb" is actually a valid
Unicode string because the hexadecimal character escape isn't
terminated by the "b".  But this was masked by an incorrect
closing parentheses, causing an unrelated error.
2017-12-22 01:56:38 +01:00
Glenn Morris
b1cf262a79 Merge from origin/emacs-26
b3f4a3a (origin/emacs-26) Special-case %DUMBFW for GnuTLS between 3.2...
c2ae057 Work around GnuTLS version issues with %DUMBFW (tiny change)
2f9d9ef ; Remove the mention of "plain C code" in the docstring as well
aca827b Merge branch 'widen-less' into emacs-26
87548f5 ; Rephrase NEWS entry a bit
da0d773 (emacs-26) ; * lisp/erc/erc.el: Update URL.
3a60515 * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler...
471b6c1 ; Replace non-ascii quote characters in doc strings etc
7af7f5e Fix some more aliases to user options
79fb4b5 Fix some flymake aliases
b9fbc03 (origin/widen-less) Widen in indent-for-tab-command in the no...
446faf3 Replace the mention of c-indent-defun with js-indent-line
7e9eef0 Consolidate 'widen' calls

# Conflicts:
#	etc/NEWS
#	lisp/progmodes/flymake-proc.el
2017-12-20 21:15:43 -05:00
Glenn Morris
a415a97461 ; Merge from origin/emacs-26
The following commit was skipped:

964dd38 Unbreak a fileio test on non-Mac OS X systems
2017-12-20 21:14:20 -05:00
Glenn Morris
b5f140166a Merge from origin/emacs-26
4122d54 Fix updating scrollbar sizes when scaling is in effect
21a212f Collect GnuTLS extensions and use them to set %DUMBFW if supp...
936136e * test/lisp/emacs-lisp/derived-tests.el: Fix copy&paste lefto...
07b7fb9 * lisp/subr.el (delayed-after-hook-functions): Rename from .....
a5b0a4e * lisp/net/shr.el (shr-string-pixel-width): Return pixel-widt...
c51e797 python.el doc fixes
c62ced5 Make 'mouse-drag-and-drop-region' more robust and customizable
2017-12-20 21:14:19 -05:00
Glenn Morris
5bf3ab291c ; Merge from origin/emacs-26
The following commit was skipped:

2e9eba2 Backport: Don't compare arguments that can be nil (Bug#28039)
2017-12-20 21:14:19 -05:00
Glenn Morris
0482fa774c Merge from origin/emacs-26
89cfdbf Don't mess up syntax-ppss cache in electric-pair (Bug#29710)
c5061d8 * etc/emacs.appdata.xml: Update file format.
080f227 Use utf-8-hfs-unix on macOS (Bug#29712)
28e0261 * lisp/progmodes/cc-defs.el (c-version): Update to 5.33.1.
ac53084 Improve fix for Bug#29712
ffd4771 * doc/lispref/sequences.texi (Sequence Functions): Improve in...
f274cbd Avoid reordering of output in 'shr-insert-document'
7890864 Improve documentation of 'invisible-p'
a1327bb Remove one more check that Vframe_list is non-nil
63b6281 Fix off-by-one error in 'css--hex-color'
804b37c Save and restore text-pixel height and width of frames (Bug#2...
777fe94 Partially revert "Mention new strictness for &optional, &rest...
ad17db7 * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-m...
5a7d009 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete al...
e019c35 FOR_EACH_FRAME no longer assumes frame-list
d64b88d * src/font.c (Ffont_info): Doc fix.  (Bug#29682)
92b2604 Modernise message.el face spec syntax
b1efbe6 Update message.el obsolete face aliases
2494c14 ; * lisp/comint.el (comint-terminfo-terminal): Add a :version...
12ad276 Improve documentation of TERM environment variable
8ed529f Add option to configure comint TERM
889f07c Better support utf-8-with-signature and utf-8-hfs in XML/HTML
a2697fa * lisp/menu-bar.el (menu-bar-mode): Doc fix.
ffb50ea ; * etc/NEWS: Fix last change.
95606af Fix Bug#29712 in tramp-tests.el
9bf66c6 Don't run FOR_EACH_FRAME when there's no frame left (Bug#29961)
c2a88ec * lisp/textmodes/tex-mode.el: Ensure uncompiled file is loada...
b178870 Remember password change for IMAP in Gnus (Bug#29692)
a21dac1 Add %DUMBFW to the default GnuTLS priority strings
780407c Small fixes prompted by make check-declare
541a601 Fix some custom groups
e220d6e Fix fontification of first declaration within a C++ lambda form.
aa66da2 * src/data.c (Fadd_variable_watcher): Doc fix.
f838210 Fix misfontification of C++ member initialization list after ...
232c646 Fix doc-string of Fbuffer_list
3f9aac6 Don't raise an extraneous frame (bug#29696)
e7b1111 Mention new strictness for &optional, &rest in arglists (Bug#...
4cb8696 Don't misfontify "foo ()" inside C++ initialization parenthes...
ce31e72 Fixes for defcustoms, prompted by cus-test-opts
aacd1e1 * lisp/net/newst-backend.el (newsticker--raw-url-list-default...
7e2f4d3 * lisp/htmlfontify.el (hfy-which-etags): Fix it.
52d2a69 Add missing :version tags revealed by cusver-check
f5d0360 Escape column-zero doc parens
45099bb Remove ObjC blocks (Bug#23753)
b0369d0 Import the latest IVD_Sequences.txt
cd53b63 Fix dired-do-compress when tar doesn't default to stdin (Bug#...
51911da Suppress warnings during elisp completion macroexpansion
a36a090 * lisp/progmodes/verilog-mode.el (verilog-mode): Fix typo (Bu...
6a6e8e6 Make tramp-interrupt-process more robust
5bcd468 Make quail-input-method work when inhibit-read-only is non-ni...
87baf12 Fix 'fontset-name-p'
d231587 Fix fontset documentation inconsistencies for bug#29630
a829cb8 Remove sentence from child frames section in Elisp manual
ad491c8 Avoid crashes in 'font-at' after 'set-fontset-font'
c73d2cd * lisp/files-x.el (connection-local-set-profile-variables): F...
cefca2b Add /etc/ssl/cert.pem to gnutls-trustfiles for macOS
122e726 Fix tool-tip display when display margins are non-zero by def...
e1cc203 Handle hash tables and vectors when reading/writing EIEIO obj...
cda219c Improve interactive debugging commands in xdisp.c
1056b3c Fix calculation of continuation_pixel_width in display engine
90e2080 Improve documentation of 'save-abbrevs'.
14f0230 Improve documentation of Dired
161b0e5 * lisp/bookmark.el (bookmark-alist): Doc fix.  (Bug#29551)
7eea314 Minor Tramp fixes
c0a670a * lisp/help-mode.el (help-function-def): Allow help-make-xref...
0572016 Fix doc-string of 'display-buffer-in-side-window'
a1bbc49 Fix Bug#29579
cb3d979 ; NEWS: Update Org version number
445eefd Backport: Update Org to v9.1.4
5381c70 In windows.texi mention special splitting behavior of side an...
46d62b9 * lisp/gnus/gnus-group.el (gnus-group-mode-map): Bind [follow...
1ef1dbd Avoid compilation warning in xterm.c
5cf3c26 * README: Document all the top-level directories.  (Bug#29558)
e9ea206 Don't enable erc modules on simply loading erc.el
4b06af0 Allow shr to use data: URLs without encoding
1fdac2d Don't add newlines in minibuffer history
de68f33 modhelp.py: Support Python 3 (Bug#24954)
afb04f7 Use forward slashes for python w32 config example (Bug#21656)
04e5b28 Fix bug in i18n/l10n optimization
8227087 Let autoload-compute-prefix be set file-locally (Bug#29471)
98ca7d5 Improve edit-kbd-macro prompting in case of remapped keys (Bu...
c02c1f6 Add tests on electric-indentation and Python multiline string...
946bb6d Disable electric indent for python strings (Bug#29305)
35f1ed1 ; ChangeLog.2: Fix bug reference.
ac31663 Fix buffer overflow in fontname conversion (Bug#29523)
bf9b972 Fix byte compilation of files with leading directories
ac144dc * lisp/files.el (make-backup-file-name-1): Fix scoping error.
1b351c8 Revert Tramp commit from 2017-11-20
77cf972 Improve documentation of buffer-list commands and features
66ec92a Fix backing up remote files in local directories on MS-Windows
7e61e74 * doc/emacs/mule.texi (Output Coding): Clarify sendmail coding.
1e25cd7 Revert "Fix backing up remote files in local directories on M...
f52d795 Fix a typo in ELisp manual
bf26fc3 * lisp/composite.el (find-composition): Fix a typo in the doc...
34a21c3 ; Auto-commit of loaddefs files.
8c8b673 Fix backing up remote files in local directories on MS-Windows
8eb6870 Fix vertical cursor motion in pixel-scroll.el
625e84f Fix typos in doc strings of message.el
9292276 Fix a typo in the Emacs manual
42509c0 Improve the documentation of 'table-insert-sequence'
93dc7ae Port better to QNX
ad99550 Make tramp-test42-auto-load more robust
af0ce33 ; * lisp/composite.el (find-composition): Fix a typo in last ...
bdbcdba Avoid assertions in find-composition
408862f ; * lisp/emacs-lisp/bytecomp.el: Tweak message formatting in ...
9964db4 Restore obsolete method of changing byte-compile-dest-file
3dd25ae Some minor Tramp corrections
d670a15 * doc/misc/url.texi (http/https): Fix typo
99d07e8 Remove some bogus definition-prefixes from loaddefs
2017-12-20 21:14:19 -05:00
Ted Zlatanov
b3f4a3a5ae
Special-case %DUMBFW for GnuTLS between 3.2.5 and 3.5.1
* src/gnutls.c: Introduce HAVE_GNUTLS_EXT__DUMBFW for GnuTLS >= 3.2.5.
(Fgnutls_available_p): Use it.
2017-12-20 20:12:42 -05:00
Andy Moreton
c2ae057d0e
Work around GnuTLS version issues with %DUMBFW (tiny change)
* src/gnutls.c: Introduce HAVE_GNUTLS_EXT_GET_NAME and use it.
(init_gnutls_functions): Use it.
(Fgnutls_available_p): Use it (Bug#25061). Fix Vlibrary_cache bug.
2017-12-20 20:07:54 -05:00
Dmitry Gutov
2f9d9efd08 ; Remove the mention of "plain C code" in the docstring as well 2017-12-21 00:38:36 +02:00
Dmitry Gutov
aca827b0d0 Merge branch 'widen-less' into emacs-26 2017-12-21 00:34:07 +02:00
Dmitry Gutov
87548f5e98 ; Rephrase NEWS entry a bit 2017-12-21 00:33:48 +02:00
Glenn Morris
da0d7730b5 ; * lisp/erc/erc.el: Update URL. 2017-12-20 16:31:00 -05:00
Glenn Morris
3a6051578b * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler warning. 2017-12-20 16:29:40 -05:00
Glenn Morris
471b6c163f ; Replace non-ascii quote characters in doc strings etc 2017-12-20 16:23:11 -05:00
Glenn Morris
7af7f5e155 Fix some more aliases to user options
* lisp/cus-edit.el (custom-mode-hook):
* lisp/erc/erc.el (erc-default-coding-system):
* lisp/progmodes/python.el (python-indent, python-guess-indent)
(python-shell-virtualenv-path)
(python-shell-completion-module-string-code)
(python-shell-completion-pdb-string-code, python-use-skeletons):
Define aliases to user options before the options are defined.
2017-12-20 16:05:46 -05:00
Charles A. Roelli
9f1c613b07 Fix vc-region-history when narrowed
* lisp/vc/vc.el (vc-region-history): Fix behavior when narrowed, by using
line numbers starting from (point-min).
2017-12-20 20:57:42 +01:00
Charles A. Roelli
7d392ccd69 Ensure current buffer is version-controlled in vc-region-history
* lisp/vc/vc.el (vc-region-history): Ensure buffer is
version-controlled.  Otherwise if a user runs it in a
non-version-controlled buffer, they get the error:

  Cannot open load file: No such file or directory, vc-nil
2017-12-20 20:40:14 +01:00
Glenn Morris
79fb4b5438 Fix some flymake aliases
* lisp/progmodes/flymake-proc.el (flymake-xml-program)
(flymake-compilation-prevents-syntax-check, flymake-master-file-dirs)
(flymake-master-file-count-limit, flymake-allowed-file-name-masks):
* lisp/progmodes/flymake.el (flymake-start-syntax-check-on-find-file):
Define aliases to user options before the options are defined.
2017-12-20 14:31:03 -05:00
Glenn Morris
964dd38c8f Unbreak a fileio test on non-Mac OS X systems
* test/src/fileio-tests.el (fileio-tests--symlink-failure):
Don't use an undefined coding system.
; No need to merge to master, since breaking commit wasn't merged.
2017-12-20 14:28:04 -05:00
Philipp Stephani
615c5cf0a6 Define helper functions only if needed
* src/json.c (JSON_HAS_ERROR_CODE): New define.
(json_parse_error): Use it.
(json_has_prefix, json_has_suffix): Define only if needed.
2017-12-20 18:36:35 +01:00
Philipp Stephani
4bb8e2879d * src/json.c (json_parse_error): Fix embarrassing bug. 2017-12-20 18:30:23 +01:00
Philipp Stephani
909bea9e5a Fix a few compiler warnings in auth-source.el
* lisp/auth-source.el (json): Add missing require.
(auth-source-json-search): Remove unused argument.
2017-12-20 18:06:28 +01:00
Robert Pluim
4122d54067 Fix updating scrollbar sizes when scaling is in effect
* src/gtkutil.c (xg_update_scrollbar_pos): Update width of
scrollbar when scaling is in effect.
(xg_update_horizontal_scrollbar_pos): Update scrollbar size
when scaling is in effect.
2017-12-20 09:24:17 +01:00
Ted Zlatanov
675a4e13cf
* lisp/auth-source.el (auth-source-backends-parser-file): Fix missing stringp. 2017-12-19 20:01:11 -05:00
Dmitry Gutov
b9fbc03b86 Widen in indent-for-tab-command in the normal case, too
Fixing this obvious omission.
* lisp/indent.el (indent--funcall-widened): New function.
(indent-for-tab-command): Use it.
2017-12-20 01:42:49 +02:00
Philipp Stephani
24efda1d28 Use Jansson's error code support if available
* src/json.c (json_parse_error): Use Jansson's error code support if
available.
2017-12-19 22:48:03 +01:00
Glenn Morris
f946a198cb * doc/misc/auth.texi: Fix use of {} and wrapping in previous change. 2017-12-19 15:10:34 -05:00
Ted Zlatanov
21a212f9e2
Collect GnuTLS extensions and use them to set %DUMBFW if supported
* lisp/net/gnutls.el (gnutls-boot-parameters): Use it to set %DUMBFW
only when it's supported as "ClientHello Padding" (Bug#25061).

* src/gnutls.c (Fgnutls_available_p): Get extension names and
put them in the GnuTLS capabilities, using a hard-coded limit
of 100 since GnuTLS MAX_EXT_TYPES is not exported.
2017-12-19 12:43:56 -05:00
Philipp Stephani
db4f12e93f Allow JSON parser functions to return alists
* src/json.c (Fjson_parse_string, Fjson_parse_buffer): Give these
functions a keyword argument to specify the return type for JSON
objects.
(json_to_lisp): Convert objects to alists if requested.
(json_parse_object_type): New helper function to parse keyword
arguments.

* test/src/json-tests.el (json-parse-string/object): Add a unit test.

* doc/lispref/text.texi (Parsing JSON): Document new functionality.
2017-12-19 18:20:55 +01:00
Ted Zlatanov
16813e6faa
* doc/misc/auth.texi (Help for users): Mention JSON backend. 2017-12-19 11:45:48 -05:00
Ted Zlatanov
1d0a37f845
auth-source: support JSON backend with .json extension
* lisp/auth-source.el (auth-source-backends-parser-file): Look
for .gpg extension and make backend decision without it. Add
JSON case to backends.

(auth-source-json-check): Parse JSON data.
2017-12-19 11:45:48 -05:00
Glenn Morris
56274bc0bb Add a Makefile rule for running gitmerge
* Makefile.in (GITMERGE_EMACS, GITMERGE_NMIN): New variables.
(gitmerge): New phony target.
2017-12-18 20:08:31 -05:00
Glenn Morris
066b65d03d Set minimum number of commits for gitmerge in batch mode
* admin/gitmerge.el (gitmerge-minimum-missing): New variable.
(gitmerge): In batch mode, respect gitmerge-minimum-missing.
2017-12-18 19:56:21 -05:00
Glenn Morris
2a8d2d5daf * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode. 2017-12-18 19:49:51 -05:00
Glenn Morris
1e89864f92 Make gitmerge usable in batch mode
* admin/gitmerge.el (gitmerge-missing): Add progress messages.
(gitmerge-maybe-resume): In batch mode, never resume.
(gitmerge): Handle batch mode.
2017-12-18 19:38:25 -05:00
Philipp Stephani
91031a2cfd ; Add a couple of encoding-related FIXMEs to json.c
* src/json.c (json_make_string, json_build_string, json_encode)
(lisp_to_json_toplevel_1, lisp_to_json): Add FIXMEs for problematic
string error reporting.
2017-12-19 00:15:01 +01:00
Philipp Stephani
205d02c1b5 ; * src/json.c (lisp_to_json): Inline an unnecessary variable. 2017-12-19 00:13:02 +01:00
Philipp Stephani
87bd1d914e ; Add comments about potential future Jansson flags
* src/json.c (Fjson_serialize, Fjson_insert): Add comments about
flags that we might potentially add in the future.
2017-12-19 00:11:40 +01:00
Philipp Stephani
994ce51b28 JSON: Add tests for Unicode edge cases
* test/src/json-tests.el (json-serialize/string): Add test for
serializing the null character.
(json-parse-string/null): Add test for parsing the null character.
(json-serialize/invalid-unicode): Add tests for invalid Unicode
strings.
(json-serialize/roundtrip): Add Unicode
noncharacter, non-BMP characters, and syntactic characters.
2017-12-19 00:10:24 +01:00
Charles A. Roelli
9685774e38 Fix infinite loop in vc-dir-mark-unmark
* lisp/vc/vc-dir.el (vc-dir-mark-unmark): Prevent from getting
stuck on the same line in an infinite loop.  (Bug#24017)
2017-12-18 20:56:03 +01:00
Eric Abrahamsen
5f17472574 Fix Gnus registry header extraction
* lisp/gnus/gnus-registry.el (gnus-registry-fetch-recipients-fast,
  gnus-registry-fetch-sender-fast): First, delete
  `gnus-registry-fetch-header-fast'. It was being called with reversed
  arguments, and thus always returned nil, but even if the argument
  order was correct it would have raised an error, as it was trying to
  `assq' a string in a vector. Instead, just have these two functions
  do their own work, as they're doing fairly different things.
2017-12-18 10:10:52 -08:00
Stefan Monnier
936136ecab * test/lisp/emacs-lisp/derived-tests.el: Fix copy&paste leftovers 2017-12-18 11:43:34 -05:00
Stefan Monnier
07b7fb98e6 * lisp/subr.el (delayed-after-hook-functions): Rename from ...-forms
(run-mode-hooks): `funcall` the functions instead of `eval`ing the forms.
* lisp/emacs-lisp/derived.el (define-derived-mode): Push functions
rather than forms (bug#29679).
2017-12-18 11:39:17 -05:00
Katsumi Yamaoka
a5b0a4e292 * lisp/net/shr.el (shr-string-pixel-width): Return pixel-width,
not position (bug#29734).
2017-12-18 02:53:26 +00:00
Paul Eggert
5959b48ece Default CHECK_LISP_OBJECT_TYPE to "no"
* configure.ac: Go back to not defining CHECK_LISP_OBJECT_TYPE by
default for developer builds, since it is no longer that useful.
We can make it a no-op entirely later, if in practice it's not
that helpful to enable it.
2017-12-17 18:44:27 -08:00
Dmitry Gutov
446faf3efa Replace the mention of c-indent-defun with js-indent-line
* doc/lispref/text.texi (Mode-Specific Indent):
Avoid mentioning c-indent-defun in the context of multi-mode
indentation.
2017-12-18 02:30:41 +02:00
Charles A. Roelli
c51e797bba python.el doc fixes
* lisp/progmodes/python.el (python-shell-accept-process-output):
(python-shell-comint-end-of-output-p):
(python-shell-first-prompt-hook):
(python-info-beginning-of-backslash): Doc fixes.
2017-12-17 17:09:55 +01:00
Michael Albinus
b4486de0c6 Minor fixes in Tramp
* lisp/net/tramp-archive.el
(tramp-archive-handle-temporary-file-directory): New defun.
(tramp-archive-file-name-handler-alist): Use it.

* test/lisp/net/tramp-archive-tests.el
(tramp-archive-test99-libarchive-tests): Rename it.

* test/lisp/net/tramp-tests.el (tramp-test34-vc-registered):
Skip for older Emacsen.
2017-12-17 11:32:48 +01:00
Tak Kunihiro
c62ced5b4d Make 'mouse-drag-and-drop-region' more robust and customizable
* lisp/mouse.el
(mouse-drag-and-drop-region-cut-when-buffers-differ): New option
to permit 'mouse-drag-and-drop-region' to cut text also when source
and destination buffers differ.
(mouse-drag-and-drop-region-show-tooltip): New option to toggle
display of tooltip during mouse dragging on graphic displays.
(mouse-drag-and-drop-region-show-cursor): New option to toggle
moving point with mouse cursor during mouse dragging of region.
(mouse-drag-and-drop-region): New face to highlight original
text while dragging.
(mouse-drag-and-drop-region): Make use of new options and face.
Ignore errors during tracking.
2017-12-17 11:19:19 +01:00
Simen Heggestøyl
bd9e8b31a1 Add command for cycling between CSS color formats
* lisp/textmodes/css-mode.el (css-mode-map): Add keybinding for
'css-cycle-color-format'.
(css--rgb-color): Add support for extracting alpha component.
(css--hex-alpha, css--color-to-4-dpc, css--named-color-to-hex)
(css--format-rgba-alpha, css--hex-to-rgb)
(css--rgb-to-named-color-or-hex): New functions.
(css-cycle-color-format): New command for cycling between color
formats.

* test/lisp/textmodes/css-mode-tests.el (css-test-color-to-4-dpc):
(css-test-named-color-to-hex, css-test-format-rgba-alpha)
(css-test-hex-to-rgb, css-test-rgb-to-named-color-or-hex)
(css-test-cycle-color-format, css-test-hex-alpha): New tests for the
changes mentioned above.

* etc/NEWS: Mention the new command.
2017-12-17 10:26:04 +01:00