aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year to 2018Paul Eggert2018-01-012-2/+2
* Merge from origin/emacs-26Paul Eggert2018-01-01215-230/+244
|\
| * Update copyright year to 2018Paul Eggert2018-01-01215-215/+215
| * Fix subtle problem with scroll-down when scroll-margin is nonzeroEli Zaretskii2017-12-291-2/+3
| * * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846Stefan Monnier2017-12-281-9/+11
| * Improve documentation of 'inhibit-modification-hooks' and friendsEli Zaretskii2017-12-282-3/+14
| * Fix doc string of 'enable-recursive-minibuffers'David Pathakjee2017-12-281-1/+1
* | Improve error reporting when serializing non-Unicode strings to JSONPhilipp Stephani2017-12-303-8/+48
* | Merge from origin/emacs-26Glenn Morris2017-12-271-0/+8
|\ \ | |/
| * Avoid crashes when ':eval' deletes our frameEli Zaretskii2017-12-231-0/+8
* | Fix MS-Windows build broken by recent changes in json.cChris Zheng2017-12-251-0/+3
* | Make main_thread_id privatePaul Eggert2017-12-242-2/+1
* | On non-MS-Windows, omit unnecessary polling functionsPaul Eggert2017-12-241-4/+8
* | Accept alists when serializing JSONPhilipp Stephani2017-12-241-10/+47
* | JSON serialization: reject duplicate keys in hashtablesPhilipp Stephani2017-12-241-1/+6
* | Merge from origin/emacs-26Glenn Morris2017-12-221-2/+6
|\ \ | |/
| * ; * src/xdisp.c (extend_face_to_end_of_line): Fix last change.Eli Zaretskii2017-12-211-4/+6
| * Prevent infloop in redisplay on TTY framesEli Zaretskii2017-12-211-0/+2
* | JSON: improve some commentsPhilipp Stephani2017-12-221-5/+8
* | Merge from origin/emacs-26Glenn Morris2017-12-201-11/+38
|\ \ | |/
| * 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
* | Merge from origin/emacs-26Glenn Morris2017-12-202-2/+20
|\ \ | |/
| * 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-191-1/+13
* | 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
* | Use Jansson's error code support if availablePhilipp Stephani2017-12-191-3/+12
* | Allow JSON parser functions to return alistsPhilipp Stephani2017-12-191-30/+99
* | ; 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
* | Merge from origin/emacs-26Glenn Morris2017-12-166-23/+33
|\ \ | |/
| * Improve documentation of 'invisible-p'Eli Zaretskii2017-12-161-11/+17
| * Remove one more check that Vframe_list is non-nilMartin Rudalics2017-12-161-3/+2
| * FOR_EACH_FRAME no longer assumes frame-listPaul Eggert2017-12-152-8/+10
| * * src/font.c (Ffont_info): Doc fix. (Bug#29682)Eli Zaretskii2017-12-151-5/+5
| * Don't run FOR_EACH_FRAME when there's no frame left (Bug#29961)Martin Rudalics2017-12-152-5/+8
| * * src/data.c (Fadd_variable_watcher): Doc fix.Charles A. Roelli2017-12-141-1/+1
| * Fix doc-string of Fbuffer_listMartin Rudalics2017-12-141-3/+3
| * Remove ObjC blocks (Bug#23753)Alan Third2017-12-121-73/+55
* | Remove two unused variables in macfont.mPhilipp Stephani2017-12-161-2/+0
* | Silence macOS 10.13 deprecation notices (Bug#29643)Alan Third2017-12-164-6/+28
* | ; * src/json.c: Convert non-ASCII quotes to ASCII characters.Eli Zaretskii2017-12-141-6/+6
* | * src/syntax.c (find_defun_start): Use syntax-ppssStefan Monnier2017-12-121-0/+26
* | Merge from origin/emacs-26Glenn Morris2017-12-127-896/+946
|\ \ | |/
| * Import the latest IVD_Sequences.txtEli Zaretskii2017-12-121-880/+883
| * Avoid crashes in 'font-at' after 'set-fontset-font'Eli Zaretskii2017-12-101-0/+4
| * Fix tool-tip display when display margins are non-zero by defaultEli Zaretskii2017-12-094-3/+26
| * Improve interactive debugging commands in xdisp.cEli Zaretskii2017-12-091-12/+33