1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-05 11:21:04 -08:00
Commit graph

131531 commits

Author SHA1 Message Date
Glenn Morris
f946a198cb * doc/misc/auth.texi: Fix use of {} and wrapping in previous change. 2017-12-19 15:10:34 -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
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
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
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
Stefan Monnier
ac0d6c06b8 * lisp/textmodes/css-mode.el (css--hex-color): Trivial simplification 2017-12-16 17:43:38 -05:00
Glenn Morris
f74d811e80 ; Merge from origin/emacs-26
The following commit was skipped:

080f227331 (origin/emacs-26) Use utf-8-hfs-unix on macOS (Bug#29712)
2017-12-16 12:18:45 -08:00
Glenn Morris
8e46d93dcd Merge from origin/emacs-26
28e0261890 * lisp/progmodes/cc-defs.el (c-version): Update to 5.33.1.
ac53084f9b Improve fix for Bug#29712
ffd4771560 * doc/lispref/sequences.texi (Sequence Functions): Improve...
f274cbd185 Avoid reordering of output in 'shr-insert-document'
7890864413 Improve documentation of 'invisible-p'
a1327bbc64 Remove one more check that Vframe_list is non-nil
63b6281fdd Fix off-by-one error in 'css--hex-color'
804b37ca63 Save and restore text-pixel height and width of frames (Bu...
777fe94661 Partially revert "Mention new strictness for &optional, &r...
ad17db7964 * lisp/vc/smerge-mode.el (smerge-refine): Respect font-loc...
5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete...
e019c35df6 FOR_EACH_FRAME no longer assumes frame-list
d64b88da2f * src/font.c (Ffont_info): Doc fix.  (Bug#29682)
92b2604a7f Modernise message.el face spec syntax
b1efbe6564 Update message.el obsolete face aliases
2494c14e76 ; * lisp/comint.el (comint-terminfo-terminal): Add a :vers...
12ad276d15 Improve documentation of TERM environment variable
8ed529f0f3 Add option to configure comint TERM
889f07c352 Better support utf-8-with-signature and utf-8-hfs in XML/HTML
a2697fac0e * lisp/menu-bar.el (menu-bar-mode): Doc fix.
ffb50eace6 ; * etc/NEWS: Fix last change.
95606af8b0 Fix Bug#29712 in tramp-tests.el
9bf66c6bee Don't run FOR_EACH_FRAME when there's no frame left (Bug#2...
c2a88ec8e8 * lisp/textmodes/tex-mode.el: Ensure uncompiled file is lo...
b178870528 Remember password change for IMAP in Gnus (Bug#29692)
a21dac18bb Add %DUMBFW to the default GnuTLS priority strings
780407cff1 Small fixes prompted by make check-declare
541a60108d Fix some custom groups
e220d6e112 Fix fontification of first declaration within a C++ lambda...
aa66da220c * src/data.c (Fadd_variable_watcher): Doc fix.
f838210b01 Fix misfontification of C++ member initialization list aft...
232c6465ce Fix doc-string of Fbuffer_list
3f9aac68d7 Don't raise an extraneous frame (bug#29696)
e7b1111155 Mention new strictness for &optional, &rest in arglists (B...
4cb8696e47 Don't misfontify "foo ()" inside C++ initialization parent...
ce31e726ad Fixes for defcustoms, prompted by cus-test-opts
aacd1e14fc * lisp/net/newst-backend.el (newsticker--raw-url-list-defa...
7e2f4d3d41 * lisp/htmlfontify.el (hfy-which-etags): Fix it.
52d2a690f6 Add missing :version tags revealed by cusver-check
f5d0360234 Escape column-zero doc parens

# Conflicts:
#	etc/NEWS
2017-12-16 12:18:45 -08:00
Alan Third
080f227331 Use utf-8-hfs-unix on macOS (Bug#29712)
This is a quick fix for the Emacs 26 release. Do not merge to master.

* test/src/fileio-tests.el (fileio-tests--symlink-failure): Override
file-name-coding-system to utf-8-hfs-unix to prevent test failure.
2017-12-16 18:24:40 +00:00
Philipp Stephani
da2c441079 Remove two unused variables in macfont.m
* src/macfont.m (macfont_get_glyph_for_character): Remove two unused
variables.
2017-12-16 19:16:01 +01:00
Alan Third
a4f220d09b Use utf-8-hfs-unix on macOS (Bug#29712)
* lisp/term/ns-win.el: Use utf-8-hfs-unix instead of utf-8-hfs.
2017-12-16 17:04:58 +00:00
Alan Third
95e7195f0d Silence macOS 10.13 deprecation notices (Bug#29643)
* src/nsfns.m (Fx_display_backing_store):
(Fx_display_save_under): Don't use NSBackingStoreRetained or
NSBackingStoreNonretained on macOS 10.13+.
* src/nsselect.m (symbol_to_nsstring):
(ns_string_to_symbol):
(nxatoms_of_nsselect): Replace NSGeneralPboard with
NSPasteboardNameGeneral.
* src/nsterm.h: #define NSPasteboardNameGeneral to NSGeneralPboard on
GNUstep and macOS < 10.13.
* src/nsterm.m (EmacsView::resetCursorRects):
(EmacsScroller::resetCursorRects): Don't use setOnMouseEntered on
macOS 10.13+.
2017-12-16 16:35:46 +00:00
Alan Mackenzie
28e0261890 * lisp/progmodes/cc-defs.el (c-version): Update to 5.33.1. 2017-12-16 16:01:49 +00:00
Michael Albinus
ac53084f9b Improve fix for Bug#29712
* test/lisp/net/tramp-tests.el
(tramp-test32-environment-variables-and-port-numbers):
Adapt check for systems which do not support "echo -n".  (Bug#29712)
2017-12-16 16:40:03 +01:00
Eli Zaretskii
ffd4771560 * doc/lispref/sequences.texi (Sequence Functions): Improve indexing. 2017-12-16 16:54:32 +02:00
Eli Zaretskii
f274cbd185 Avoid reordering of output in 'shr-insert-document'
* lisp/net/shr.el (shr-string-pixel-width): Preserve point across
shr-pixel-column invocations.  (Bug#29734)
2017-12-16 16:09:41 +02:00
Eli Zaretskii
7890864413 Improve documentation of 'invisible-p'
* doc/lispref/display.texi (Invisible Text): Document the return
value of 'invisible-p'.

* src/xdisp.c (Finvisible_p): Rename the argument POS.  Doc fix.
(Bug#29721)
2017-12-16 12:15:06 +02:00
Michael Albinus
f63d9f86b5 Suppress timers in Tramp operations
* lisp/net/tramp.el (tramp-accept-process-output):
* lisp/net/tramp-adb.el (tramp-adb-handle-start-file-process):
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band)
(tramp-sh-handle-start-file-process):
* lisp/net/tramp-smb.el (tramp-smb-handle-copy-directory)
(tramp-smb-handle-file-acl, tramp-smb-handle-process-file)
(tramp-smb-handle-set-file-acl)
(tramp-smb-handle-start-file-process): Suppress timers.

* test/lisp/net/tramp-tests.el (tramp-test41-asynchronous-requests):
Use $REMOTE_PARALLEL_PROCESSES.  Flush cache prior file operations.
Add instrumentation messages.
2017-12-16 10:47:06 +01:00
Martin Rudalics
a1327bbc64 Remove one more check that Vframe_list is non-nil
* src/dispnew.c (check_glyph_memory): Remove no-longer-needed
check that Vframe_list is non-nil, as FOR_EACH_FRAME no longer
assumes that.
2017-12-16 10:14:29 +01:00
Simen Heggestøyl
63b6281fdd Fix off-by-one error in 'css--hex-color'
* lisp/textmodes/css-mode.el (css--hex-color): Fix off-by-one error.

* test/lisp/textmodes/css-mode-tests.el (css-test-hex-color): New test
for 'css--hex-color'.
2017-12-16 09:46:54 +01:00
Aaron Jensen
804b37ca63 Save and restore text-pixel height and width of frames (Bug#28442)
* lisp/frameset.el (frameset--record-relationships): Record
text-pixel-height and text-pixel-width of frame.
(frameset--restore-frame): Restore text-pixel-height and
text-pixel-width of frame if available.  (Bug#28442)
2017-12-16 09:36:35 +01:00
Noam Postavsky
777fe94661 Partially revert "Mention new strictness for &optional, &rest..."
The changes to cl argument parsing are not backwards compatible, and
cause inconvenience when writing macros (e.g., instead of doing '&aux
,@auxargs', some more complicated conditionals would be required).
The `cl-defstruct' macro makes use of this convenience when defining
empty structs (Bug#29728).
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
(cl--do-&aux, cl--do-arglist): Undo strict checking of &rest, &key,
and &aux.
* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-bad-arglist): Remove
test.
2017-12-15 23:41:20 -05:00
Oscar Fuentes
506270f9c8 Don't compare arguments that can be nil
copy-region-as-kill can be called passing nil as `beg' and
`end'. Magit does that, which caused an error when this advice was in
effect.

* lisp/ses.el (ses--advice-copy-region-as-kill): avoid comparison
  unless `beg' and `end' are non-nil.
2017-12-16 01:37:21 +01:00
Glenn Morris
5e6fb1e246 Automatically evaluate top-level define-obsolete-function-alias etc
* lisp/emacs-lisp/bytecomp.el (byte-compile-file-form-make-obsolete):
New handler.
2017-12-15 16:22:25 -05:00
Glenn Morris
ad17db7964 * lisp/vc/smerge-mode.el (smerge-refine): Respect font-lock-mode. 2017-12-15 13:40:06 -05:00
Glenn Morris
5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete alias. 2017-12-15 13:35:42 -05:00
Paul Eggert
e019c35df6 FOR_EACH_FRAME no longer assumes frame-list
This cleans up a recent fix related to Bug#29661.
Suggested by Stefan Monnier in:
https://lists.gnu.org/r/emacs-devel/2017-12/msg00544.html
* src/frame.c (next_frame, prev_frame, delete_frame):
Restore debugging checks that Vframe_list is non-nil,
as FOR_EACH_FRAME no longer has these checks.
(delete_frame): Remove no-longer-needed checks that Vframe_list is
non-nil, as FOR_EACH_FRAME no longer assumes that.
* src/frame.h (FOR_EACH_FRAME): Do not assume Vframe_list is non-nil.
2017-12-15 09:08:27 -08:00
Eli Zaretskii
d64b88da2f * src/font.c (Ffont_info): Doc fix. (Bug#29682) 2017-12-15 12:30:30 +02:00
Basil L. Contovounesios
92b2604a7f Modernise message.el face spec syntax
* lisp/gnus/message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name, message-header-xheader)
(message-separator, message-cited-text, message-mml):
Use (DISPLAY . PLIST) face spec syntax as recommended in
`(elisp) Defining Faces'.  (Bug#29405)
2017-12-15 12:20:38 +02:00
Basil L. Contovounesios
b1efbe6564 Update message.el obsolete face aliases
* lisp/gnus/message.el: (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name, message-header-xheader)
(message-separator, message-cited-text, message-mml):
Use define-obsolete-face-alias.  (Bug#29405)
2017-12-15 12:18:43 +02:00
Eli Zaretskii
2494c14e76 ; * lisp/comint.el (comint-terminfo-terminal): Add a :version tag. 2017-12-15 11:50:11 +02:00
Eli Zaretskii
12ad276d15 Improve documentation of TERM environment variable
* doc/emacs/trouble.texi (Checklist):
* doc/emacs/building.texi (Compilation Shell):
* doc/emacs/misc.texi (Shell Options): Improve indexing of TERM.
* doc/emacs/building.texi (Compilation Shell): Mention
'comint-terminfo-terminal' in conjunction with the TERM value.
2017-12-15 11:45:22 +02:00
Allen Li
8ed529f0f3 Add option to configure comint TERM
* lisp/comint.el (comint-terminfo-terminal): New defcustom.
(comint-term-environment): New function for setting terminal options
(comint-exec-1): Use comint-term-environment.  (Bug#29583)
* lisp/progmodes/compile.el (compilation-start): Use comint-term-environment.

* etc/NEWS:
* doc/emacs/misc.texi (Shell Options): Document the new option.
2017-12-15 11:30:25 +02:00
Eli Zaretskii
889f07c352 Better support utf-8-with-signature and utf-8-hfs in XML/HTML
* lisp/international/mule.el (sgml-xml-auto-coding-function):
Support UTF-8 with BOM and utf-8-hfs as variants of UTF-8, and
obey the buffer's encoding if it is one of these variants, instead
of re-encoding in UTF-8 proper.  (Bug#20623)
2017-12-15 11:06:07 +02:00
Eli Zaretskii
a2697fac0e * lisp/menu-bar.el (menu-bar-mode): Doc fix. 2017-12-15 10:59:33 +02:00
Eli Zaretskii
ffb50eace6 ; * etc/NEWS: Fix last change. 2017-12-15 10:50:22 +02:00
Michael Albinus
95606af8b0 Fix Bug#29712 in tramp-tests.el
* test/lisp/net/tramp-tests.el
(tramp-test32-environment-variables-and-port-numbers):
Skip for macOS.  (Bug#29712)
2017-12-15 09:37:42 +01:00
Martin Rudalics
9bf66c6bee Don't run FOR_EACH_FRAME when there's no frame left (Bug#29961)
This does not fix Bug#29961 but avoids that Emacs segfaults when
trying to shut down because it lost connection to the X server.

* src/dispnew.c (check_glyph_memory):
* src/frame.c (delete_frame): Don't run FOR_EACH_FRAME when
there's no frame left (Bug#29961).
2017-12-15 08:30:09 +01:00