aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix bugs in JSON testPhilipp Stephani2017-12-221-1/+1
* Merge from origin/emacs-26Glenn Morris2017-12-2021-271/+211
|\
| * Special-case %DUMBFW for GnuTLS between 3.2.5 and 3.5.1Ted Zlatanov2017-12-201-0/+8
| * Work around GnuTLS version issues with %DUMBFW (tiny change)Andy Moreton2017-12-201-11/+30
| * ; Remove the mention of "plain C code" in the docstring as wellDmitry Gutov2017-12-211-2/+2
| * Merge branch 'widen-less' into emacs-26Dmitry Gutov2017-12-217-127/+40
| |\
| | * ; Rephrase NEWS entry a bitDmitry Gutov2017-12-211-1/+1
| | * Widen in indent-for-tab-command in the normal case, toowiden-lessDmitry Gutov2017-12-201-4/+7
| | * Replace the mention of c-indent-defun with js-indent-lineDmitry Gutov2017-12-181-2/+2
| | * Consolidate 'widen' callsDmitry Gutov2017-12-147-125/+35
| * | ; * lisp/erc/erc.el: Update URL.Glenn Morris2017-12-201-3/+3
| * | * lisp/erc/erc.el (erc-shorten-server-name): Silence compiler warning.Glenn Morris2017-12-201-4/+4
| * | ; Replace non-ascii quote characters in doc strings etcGlenn Morris2017-12-209-29/+27
| * | Fix some more aliases to user optionsGlenn Morris2017-12-203-23/+24
| * | Fix some flymake aliasesGlenn Morris2017-12-202-73/+74
* | | ; Merge from origin/emacs-26Glenn Morris2017-12-200-0/+0
|\ \ \ | |/ /
| * | Unbreak a fileio test on non-Mac OS X systemsGlenn Morris2017-12-201-1/+4
* | | Merge from origin/emacs-26Glenn Morris2017-12-209-106/+390
|\ \ \ | |/ /
| * | Fix updating scrollbar sizes when scaling is in effectRobert Pluim2017-12-201-1/+7
| * | Collect GnuTLS extensions and use them to set %DUMBFW if supportedTed Zlatanov2017-12-192-28/+44
| * | * test/lisp/emacs-lisp/derived-tests.el: Fix copy&paste leftoversStefan Monnier2017-12-181-3/+2
| * | * lisp/subr.el (delayed-after-hook-functions): Rename from ...-formsStefan Monnier2017-12-183-7/+51
| * | * lisp/net/shr.el (shr-string-pixel-width): Return pixel-width,Katsumi Yamaoka2017-12-181-4/+5
| * | python.el doc fixesCharles A. Roelli2017-12-171-7/+6
| * | Make 'mouse-drag-and-drop-region' more robust and customizableTak Kunihiro2017-12-171-59/+278
* | | ; Merge from origin/emacs-26Glenn Morris2017-12-200-0/+0
|\ \ \ | |/ /
| * | Backport: Don't compare arguments that can be nil (Bug#28039)Oscar Fuentes2017-12-171-1/+1
* | | Merge from origin/emacs-26Glenn Morris2017-12-202-11/+32
|\ \ \ | |/ /
| * | Don't mess up syntax-ppss cache in electric-pair (Bug#29710)Noam Postavsky2017-12-161-3/+22
| * | * etc/emacs.appdata.xml: Update file format.Glenn Morris2017-12-161-8/+10
* | | Fix vc-region-history when narrowedCharles A. Roelli2017-12-201-2/+2
* | | Ensure current buffer is version-controlled in vc-region-historyCharles A. Roelli2017-12-201-0/+2
* | | Define helper functions only if neededPhilipp Stephani2017-12-201-1/+7
* | | * src/json.c (json_parse_error): Fix embarrassing bug.Philipp Stephani2017-12-201-0/+3
* | | Fix a few compiler warnings in auth-source.elPhilipp Stephani2017-12-201-1/+2
* | | * lisp/auth-source.el (auth-source-backends-parser-file): Fix missing stringp.Ted Zlatanov2017-12-191-1/+2
* | | Use Jansson's error code support if availablePhilipp Stephani2017-12-191-3/+12
* | | * doc/misc/auth.texi: Fix use of {} and wrapping in previous change.Glenn Morris2017-12-191-2/+4
* | | Allow JSON parser functions to return alistsPhilipp Stephani2017-12-193-45/+120
* | | * doc/misc/auth.texi (Help for users): Mention JSON backend.Ted Zlatanov2017-12-191-1/+12
* | | auth-source: support JSON backend with .json extensionTed Zlatanov2017-12-191-14/+99
* | | Add a Makefile rule for running gitmergeGlenn Morris2017-12-181-0/+10
* | | Set minimum number of commits for gitmerge in batch modeGlenn Morris2017-12-181-0/+9
* | | * admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris2017-12-181-2/+10
* | | Make gitmerge usable in batch modeGlenn Morris2017-12-181-4/+11
* | | ; Add a couple of encoding-related FIXMEs to json.cPhilipp Stephani2017-12-191-0/+8
* | | ; * src/json.c (lisp_to_json): Inline an unnecessary variable.Philipp Stephani2017-12-191-2/+1
* | | ; Add comments about potential future Jansson flagsPhilipp Stephani2017-12-191-0/+4
* | | JSON: Add tests for Unicode edge casesPhilipp Stephani2017-12-191-3/+20
* | | Fix infinite loop in vc-dir-mark-unmarkCharles A. Roelli2017-12-181-2/+6
generated by cgit v1.2.1 (git 2.18.0) at 2026-01-17 09:56:15 +0000