aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed over-eager ifdefjave2015-01-041-1/+1
| | | | | An xwidget ifdef in xdisp.c ended too late, so non xwidget code got ifdefed away unexpectedly. Should fix a crash.
* cleanupsjave2015-01-043-23/+2
|
* merge masterjave2015-01-046-7/+51
|\
| * Less 'make' chatter for lisp dirPaul Eggert2015-01-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * lisp/Makefile.in (THEFILE): Define to be 'no-such-file' by default, to make it clearer that the caller must specify it. (compile-onefile): Remove, replacing by ... ($(THEFILE)c): ... new rule. This lets us use AM_V_GEN here. ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el) ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el) ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Use AM_V_GEN to lessen 'make' chatter. (.el.elc): Omit duplicate comment. * src/Makefile.in (%.elc): Adjust to compile-onefile change in ../lisp/Makefile.in.
| * batch write-region no longer says "Wrote FOO"Paul Eggert2015-01-032-3/+10
| | | | | | | | | | | | | | | | This cuts down on 'make' chatter a bit. * doc/lispref/files.texi (Writing to Files): * etc/NEWS: Document this. * src/fileio.c (Fwrite_region): Don't output "Wrote /whatever/foo.elc" if noninteractive.
| * Revert previous change to produce_composite_glyphPaul Eggert2015-01-032-1/+4
| | | | | | | | * term.c (produce_composite_glyph): Revert previous change (Bug#19496).
| * Pacify gcc -WparenthesesPaul Eggert2015-01-032-1/+6
| | | | | | | | * frame.c (x_set_frame_parameters): Add parens (Bug#19428).
| * Two fixes for setting up sizes of a new frame (Bug#19428).Martin Rudalics2015-01-033-2/+9
| | | | | | | | | | | | | | * frame.c (x_set_frame_parameters): Call Fset_frame_size only if f->can_x_set_window_size is true. * xterm.c (x_set_window_size_1): Call change_frame_size with text sizes instead of pixel sizes (Bug#19428).
| * ChangeLog fixesGlenn Morris2015-01-021-0/+18
| |
* | merge masterjave2015-01-02202-215/+249
|\ \ | |/
| * Fix copyright years by handPaul Eggert2015-01-011-1/+1
| | | | | | | | | | | | These are dates that admin/update-copyright did not update, or updated incorrectly. Also, back out the copyright-date change to doc/misc/texinfo.tex, as upstream hasn't updated that date yet.
| * Update copyright year to 2015Paul Eggert2015-01-01201-206/+211
| | | | | | | | Run admin/update-copyright.
| * Merge from origin/emacs-24Paul Eggert2015-01-015-8/+37
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5f90a3 * .gitattributes: New file. 5a9710f Make sure tool-bar changes are reflected on display. 93796ba * autogen.sh: Port better to non-GNU 'cp'. 9758516 Fix a typo in a comment in the previous commit. aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473) d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out. 9278f05 Omit trailing white space 1c93fd3 Sync with Tramp 2.2.11. 96ebe18 Sync with Tramp 2.2.11. e792450 Sync with Tramp 2.2.11. 2d17e12 Fix ChangeLog entry. 6444482 Fix auto-revert-tail-mode for remote files b5c9c13 Spelling fixes c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) Conflicts: ChangeLog doc/misc/ChangeLog lisp/ChangeLog src/ChangeLog test/ChangeLog
| | * Fix a typo in a comment in the previous commit.Eli Zaretskii2014-12-301-1/+1
| | |
| | * Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473)Eli Zaretskii2014-12-302-4/+24
| | | | | | | | | | | | | | | src/xdisp.c (pos_visible_p): Fix up the X coordinate for right-to-left screen lines.
| | * Spelling fixesPaul Eggert2014-12-282-3/+3
| | |
| | * src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458)Eli Zaretskii2014-12-282-1/+10
| | |
* | | whitespace cleanupjave2009-01-011-2/+2
| | |
* | | whitespace cleanupjave2009-01-011-6/+6
| | |
* | | whitespace cleanupjave2009-01-011-2/+4
| | |
* | | whitespacejave2009-01-011-14/+14
| | |
* | | whitespace cleanupjave2009-01-011-0/+1
| | |
* | | whitespace cleanupjave2009-01-011-1/+2
| | |
* | | a missing merge, trailing whitespacejave2009-01-011-2/+4
| | |
* | | trailing whitespace, better ifdef of xwidget codejave2009-01-011-10/+10
| | |
* | | Doc strings, and whitespacejave2009-01-011-71/+89
| | |
* | | Removed remains of Clutter experimentjave2015-01-012-7/+2
| | | | | | | | | | | | | | | Once there was a working Clutter prototype in the xwidget code, but its removed, but might be revived in the future
* | | reverting some spurious changesjave2014-12-311-24/+0
| | |
* | | src/macuvs.h.moved showed up, and I removed it.jave2014-12-311-9215/+0
| | | | | | | | | | | | Its all very odd.
* | | merge upstreamjave2014-12-3122-1264/+1338
|\ \ \ | |/ /
| * | Simplify setfattr use by assuming GNU makePaul Eggert2014-12-302-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in (PAXCTL_if_present, SETFATTR_if_present): New macros. (emacs$(EXEEXT), temacs$(EXEEXT), bootstrap-emacs$(EXEEXT)): Use them. Simplify by using GNU make rather than shell conditionals, by using ln -f rather than rm -f followed by ln, and by preferring $@ to spelling out the destination.
| * | Update documentation of Temporary Displays.Martin Rudalics2014-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * display.texi (Temporary Displays): Amend description of `with-temp-buffer-window'. Add descriptions for `with-current-buffer-window', `with-displayed-buffer-window' and `temp-buffer-resize-mode', `temp-buffer-max-height' and `temp-buffer-max-width'. * frame.c (frame_inhibit_implied_resize): Escape left paren in doc-string.
| * | Fix the MS-Windows build.Eli Zaretskii2014-12-292-0/+8
| | | | | | | | | | | | | | | src/sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this file doesn't compile on MS-Windows.
| * | Fix previous patch to match its commit messagePaul Eggert2014-12-291-106/+0
| | |
| * | system-name's returned value can varyPaul Eggert2014-12-295-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, the system-name variable is now obsolete. Fixes Bug#19438. * doc/lispref/os.texi (System Environment): * etc/NEWS: Document this. * doc/misc/efaq.texi: (Displaying the current file name in the titlebar): * lisp/desktop.el (desktop-save-frameset): * lisp/dnd.el (dnd-get-local-file-uri): * lisp/gnus/message.el (message-make-fqdn): * lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers) (nnvirtual-update-xref-header): * lisp/nxml/rng-uri.el (rng-uri-file-name-1): * lisp/org/org-clock.el (org-clock-save): * src/filelock.c (current_lock_owner): * src/xrdb.c (get_environ_db): * src/xterm.c (same_x_server): * src/xterm.c (x_term_init): Prefer (system-name) to system-name, and avoid naming locals 'system-name'. * doc/misc/smtpmail.texi (Server workarounds): Fix grammar. * lisp/startup.el (system-name): Now an obsolete variable. * src/editfns.c (cached_system_name): New static var. (init_and_cache_system_name): New function. (init_editfns, Fsystem_name): Use it. (syms_of_editfns): Initialize it and Vsystem_name to the same value. * src/sysdep.c [HAVE_SOCKETS]: Don't include <sys/socket.h>, <netdb.h>. (h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl. (init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name. Don't create a new string if the current value is already correct.
| * | Fix produce_composite_width typoPaul Eggert2014-12-282-1/+7
| | | | | | | | | | | | | | | * term.c (produce_composite_glyph): Fix typo that confused number of columns for pixel width.
| * | Wrap dll functions more simplyPaul Eggert2014-12-286-890/+940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * decompress.c, gnutls.c, image.c, xml.c: If WINDOWSNT, use '#define FOO fn_FOO' to wrap dll functions, rather than the inverse when not WINDOWSNT. This isolates the fn_* business into the WINDOWSNT-specific section of the code, which makes it easier to maintain the generic code. * decompress.c (DEF_ZLIB_FN, LOAD_ZLIB_FN): * gnutls.c (DEF_GNUTLS_FN, LOAD_GNUTLS_FN): * image.c (DEF_IMGLIB_FN, LOAD_IMGLIB_FN): * xml.c (DEF_XML2_FN, LOAD_XML2_FN): Remove. All uses replaced by DEF_DLL_FN. * w32.h (DEF_DLL_FN, LOAD_DLL_FN): New macros.
| * | Merge from origin/emacs-24Paul Eggert2014-12-282-17/+65
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | b54f572 Port memory-full checking to GnuTLS 3.3 Conflicts: src/ChangeLog src/gnutls.c
| | * Port memory-full checking to GnuTLS 3.3Paul Eggert2014-12-272-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using gnutls_global_set_mem_functions, check every call to a GnuTLS function that might return an indication of memory exhaustion. Suggested by Dmitry Antipov in: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg02056.html * src/gnutls.c (gnutls_global_set_mem_functions) [WINDOWSNT]: Remove. (init_gnutls_functions): Do not load gnutls_global_set_mem_functions. (fn_gnutls_global_set_mem_functions) [!WINDOWSNT]: Remove. All uses removed. (check_memory_full): New function. (emacs_gnutls_handshake, emacs_gnutls_handle_error) (gnutls_make_error, Fgnutls_boot): Use it. (emacs_gnutls_global_init): Avoid gnutls_global_set_mem_functions.
| * | Fix parse_settings to match internal documentationPaul Eggert2014-12-272-17/+27
| | | | | | | | | | | | | | | | | | | | | * xsettings.c (parse_settings): Return the number of settings seen. Count the settings changes accurately. (read_settings): Don't confuse number of settings changes with the return code from XGetWindowProperty.
| * | Sanitize ChangeLog entries for previous merges.Fabián Ezequiel Gallina2014-12-271-0/+1
| | |
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-275-103/+105
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5f38fa Fix ChangeLog typo c6400e1 Fix composition of characters from Syriac and Arabis scripts. 7e9dfde python.el: Fix message when sending region. 800260c python.el: Cleanup temp files even with eval errors. ed65b91 Fix for previous commit 2dd5163 python.el: Handle file encoding for shell. 7aa506e Spelling fixes 4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..". a41d07b Fix rendering of composed caharacters on the mode line. (Bug#19435) b70977c Small doc markup fixes 73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes. 1783e6c ChangeLog fix c741b1b TUTORIAL.es: Improve style consistency f89efea TUTORIAL.es: spelling fixes 0d48826 Avoid compiler warning. Conflicts: doc/lispref/ChangeLog doc/lispref/control.texi etc/ChangeLog lisp/ChangeLog src/ChangeLog test/ChangeLog
| | * Fix rendering of composed caharacters on the mode line. (Bug#19435)Eli Zaretskii2014-12-254-99/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in composition_compute_stop_pos to the number of characters in the string. <GET_FROM_BUFFER, GET_FROM_STRING>: Simplify code. src/composite.c (composition_compute_stop_pos): If no composition was found in a string before ENDPOS, and ENDPOS is the string end, no need to back up to a safe point. src/dispextern.h (struct it) <end_charpos>: Improve commentary.
| | * Avoid compiler warning.Jan D2014-12-242-4/+6
| | | | | | | | | | | | | | | * nsimage.m (setPixmapData): Rename local variable bmRep to avoid compiler warning.
| | * Backport: Memory leak fix and 19133 fix.Jan D2014-12-242-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: debbugs:19133 * nsimage.m (allocInitFromFile:): Initialize bmRep. (dealloc): Release bmRep. (setPixmapData): Make bmRep local so class member is not set.
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-271-2/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | bef46ba Fix bad bug number reference, shall be 19427. Conflicts: src/ChangeLog
| | * Fix bad bug number reference, shall be 19427.Jan D2014-12-241-1/+1
| | |
| | * Backport: Don't cache images in nsimage.m (Bug#18918).Jan D2014-12-243-60/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: Bug#18918 * nsterm.h (EmacsImage): Remove imageListNext, refCount, reference, imageListSetNext, imageListNext. * nsimage.m (ImageList, imageListNext, imageListSetNext:) (reference): Remove. (allocInitFromFile:): Remove searching ImageList and calling reference (Bug#18918). (dealloc): Remove handling if ImageList.
| * | Merge from origin/emacs-24Fabián Ezequiel Gallina2014-12-272-7/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 216c6aa * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust. 20cfd24 Improve indexing on the chapter/section/subsection levels. 14c3739 * lisp/progmodes/js.el (js-syntax-propertize): "return" can't be divided. ea78112 * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use "\n" as end-of-line delimeter for passwords, when running on MS Windows. 012479a * lisp/progmodes/sh-script.el: Don't set global indent-line-function 75e114f Fix line numbers on Python shell. d0fd23c doc/emacs/buffers.texi (Kill Buffer): Improve indexing. 8e818d1 Keep maximized when going fullscreen. 749813e python.el: Fix electric colon behavior 936d5e5 Fix last patch. 74d3b20 Fixes: debbugs:18623 Conflicts: doc/emacs/ChangeLog doc/lispref/ChangeLog doc/lispref/functions.texi lisp/ChangeLog src/ChangeLog src/xterm.c test/ChangeLog
| | * Keep maximized when going fullscreen.Jan D2014-12-222-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Author: Fixes: Bug#19427 * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert when going to fullscreen (Bug#19427).
generated by cgit v1.2.1 (git 2.18.0) at 2026-04-24 10:38:41 +0000