aboutsummaryrefslogtreecommitdiffstats
path: root/admin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Update authors.elNicolas Petton2017-10-051-2/+5
| | | | | * admin/authors.el (authors-renamed-files-alist) (authors-valid-file-names): Additions.
* Update authors.elNicolas Petton2017-10-031-3/+21
| | | | | * admin/authors.el (authors-ignored-files, authors-valid-file-names) (authors-renamed-files-alist): Additions.
* Prefer HTTPS to HTTP for gnu.orgPaul Eggert2017-10-019-26/+25
| | | | | | | | | This fixes some URLs I omitted from my previous pass, notably those in lists.gnu.org. Although lists.gnu.org does not yet support TLS 1.1, TLS 1.0 is better than nothing. * lisp/erc/erc.el (erc-official-location): * lisp/mail/emacsbug.el (report-emacs-bug): Use https:, not http:.
* Prefer HTTPS to HTTP for gnu.orgPaul Eggert2017-09-293-4/+4
| | | | | This catches some URLs I missed in my previous scan, or perhaps were added after the scan.
* Prefer HTTPS to FTP and HTTP in documentationPaul Eggert2017-09-1352-89/+82
| | | | | | | | | | | | | Most of this change is to boilerplate commentary such as license URLs. This change was prompted by ftp://ftp.gnu.org's going-away party, planned for November. Change these FTP URLs to https://ftp.gnu.org instead. Make similar changes for URLs to other organizations moving away from FTP. Also, change HTTP to HTTPS for URLs to gnu.org and fsf.org when this works, as this will further help defend against man-in-the-middle attacks (for this part I omitted the MS-DOS and MS-Windows sources and the test tarballs to keep the workload down). HTTPS is not fully working to lists.gnu.org so I left those URLs alone for now.
* * admin/quick-install-emacs: Tweak configure.ac parsingMiles Bader2017-09-091-1/+4
|
* Merge from Gnulib; use ‘open’ for O_CLOEXECPaul Eggert2017-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | This incorporates: 2017-08-15 renameat: ensure declaration in <stdio.h> on NetBSD 2017-08-15 extensions: enable NetBSD specific extensions 2017-08-14 open: support O_CLOEXEC 2017-08-13 reallocarray: new module * admin/merge-gnulib (AVOIDED_MODULES): Remove ‘open’, since it now supports O_CLOEXEC and this simplifies Emacs. * build-aux/config.guess, lib/fcntl.in.h, lib/stdio.in.h: * lib/stdlib.in.h, m4/extensions.m4, m4/stdlib_h.m4: Copy from Gnulib. * lib/cloexec.c, lib/cloexec.h, lib/open.c: * m4/mode_t.m4, m4/open-cloexec.m4, m4/open.m4: New files, copied from Gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib-src/etags.c (O_CLOEXEC) [WINDOWSNT]: Remove, as Gnulib does this for us. * src/filelock.c (create_lock_file): * src/sysdep.c (emacs_open, emacs_pipe): Don’t worry about O_CLOEXEC == 0, as Gnulib no longer sets it to 0.
* Improve make-temp-file performance on local filesPaul Eggert2017-08-122-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | For the motivation behind this patch, please see Bug#28023 and: http://emacshorrors.com/posts/make-temp-name.html Although, given the recent changes to Tramp, the related security problem in make-temp-file is already fixed, make-temp-file still has several unnecessary system calls. In the typical case on GNU/Linux, this patch replaces 8 syscalls (symlink, open, close, readlinkat, uname, getpid, unlink, umask) by 2 (open, close). * admin/merge-gnulib (GNULIB_MODULES): Add tempname, now that Emacs is using it directly. * configure.ac (AUTO_DEPEND): Remove AC_SYS_LONG_FILE_NAMES; no longer needed. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lisp/files.el (files--make-magic-temp-file): Rename from make-temp-file. (make-temp-file): Use make-temp-file-internal for non-magic file names. * src/fileio.c: Include tempname.h. (make_temp_name_tbl, make_temp_name_count) (make_temp_name_count_initialized_p, make_temp_name): Remove. (Fmake_temp_file_internal): New function. (Fmake_temp_name): Use it. * src/filelock.c (get_boot_time): Use Fmake_temp_file_internal instead of make_temp_name.
* Merge from gnulibPaul Eggert2017-08-091-0/+1
| | | | | | | | | | | | | This incorporates: 2017-08-09 tempname: do not depend on secure_getenv 2017-08-08 extensions: add _OPENBSD_SOURCE 2017-08-06 manywarnings: Add support for C++ 2017-08-06 warnings, manywarnings: Add support for multiple languages * admin/merge-gnulib: Don't use m4/manywarnings-c++.m4. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/secure_getenv.c, m4/secure_getenv.m4: Remove. * lib/tempname.c, m4/extensions.m4, m4/manywarnings.m4, m4/warnings.m4: Copy from gnulib.
* Avoid most stat calls when completing file namesPaul Eggert2017-07-311-1/+2
| | | | | | | | | | | | | | * admin/merge-gnulib (GNULIB_MODULES): Add d-type. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * m4/d-type.m4: New file, copied from gnulib. * src/dired.c (DT_UNKNOWN, DT_DIR, DT_LINK) [!HAVE_STRUCT_DIRENT_D_TYPE]: New constants. (dirent_type): New function. (file_name_completion): Use it, to avoid unnecessary calls to stat-like functions on GNU/Linux and other platforms with d_type. (file_name_completion_stat): Just follow the link; there is no need to try first with AT_SYMLINK_NOFOLLOW since the directory entry was already checked to exist.
* Merge from gnulibPaul Eggert2017-07-231-2/+2
| | | | | | | | | | This incorporates: 2017-07-23 Rename module 'strftime' to 'nstrftime' * admin/merge-gnulib (GNULIB_MODULES): Add nstrftime, remove strftime. * build-aux/config.guess: Copy from gnulib. * lib/nstrftime.c: Rename from lib/strftime.c. * m4/nstrftime.m4: Rename from m4/strftime.m4. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* * admin/notes/hydra: Small updates.Glenn Morris2017-07-201-4/+2
|
* ; Editorial changes in admin/notes/hydraMichael Albinus2017-07-191-10/+11
|
* * admin/notes/hydra: Mention environment variable EMACS_HYDRA_CI.Michael Albinus2017-07-181-0/+6
|
* Use explicit_bzero to clear GnuTLS keysPaul Eggert2017-07-161-1/+1
| | | | | | | | * admin/merge-gnulib (GNULIB_MODULES): Add explicit_bzero. * lib/explicit_bzero.c, m4/explicit_bzero.m4: New files. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * src/gnutls.c (clear_storage): New function. (gnutls_symmetric_aead): Use it instead of memset.
* Update Unicode data and files to Unicode 10.0Eli Zaretskii2017-07-089-42/+1128
| | | | | | | | | | | | | | | * admin/notes/unicode: * admin/unidata/README: * admin/unidata/BidiBrackets.txt: * admin/unidata/BidiMirroring.txt: * admin/unidata/Blocks.txt: * admin/unidata/IVD_Sequences.txt: * admin/unidata/NormalizationTest.txt: * admin/unidata/SpecialCasing.txt: * admin/unidata/UnicodeData.txt: * lisp/international/characters.el: * lisp/international/fontset.el (script-representative-chars): * lisp/international/mule-cmds.el (ucs-names): Update per Unicode 10.0.
* Use unlocked stdio more systematicallyPaul Eggert2017-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can improve performance significantly on stdio-bottlenecked code. E.g., make-docfile is 3x faster on my Fedora 25 x86-64 desktop. * admin/merge-gnulib (GNULIB_MODULES): Add unlocked-io. * lib-src/ebrowse.c, lib-src/emacsclient.c, lib-src/etags.c: * lib-src/hexl.c, lib-src/make-docfile.c, lib-src/movemail.c: * lib-src/profile.c, lib-src/update-game-score.c: Include unlocked-io.h instead of stdio.h, since these programs are single-threaded. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/unlocked-io.h, m4/unlocked-io.m4: New files, copied from Gnulib. * src/charset.c, src/cm.c, src/emacs.c, src/image.c, src/keyboard.c: * src/lread.c, src/term.c: Include sysstdio.h, possibly instead of stdio.h, to define the unlocked functions if the system does not provide them. * src/charset.c, src/lread.c (getc_unlocked): Remove, since sysstdio.h now defines it if needed. * src/cm.c (cmputc, cmcheckmagic): * src/dispnew.c (update_frame, update_frame_with_menu) (update_frame_1, Fsend_string_to_terminal, Fding, bitch_at_user): * src/emacs.c (main, Fdump_emacs): * src/fileio.c (Fdo_auto_save, Fset_binary_mode): * src/image.c (slurp_file, png_read_from_file, png_load_body) (our_stdio_fill_input_buffer): * src/keyboard.c (record_char, kbd_buffer_get_event, handle_interrupt): * src/lread.c (readbyte_from_file): * src/minibuf.c (read_minibuf_noninteractive): * src/print.c (printchar_to_stream, strout) (Fredirect_debugging_output): * src/sysdep.c (reset_sys_modes, procfs_ttyname) (procfs_get_total_memory): * src/term.c (tty_ring_bell, tty_send_additional_strings) (tty_set_terminal_modes, tty_reset_terminal_modes) (tty_update_end, tty_clear_end_of_line, tty_write_glyphs) (tty_write_glyphs_with_face, tty_insert_glyphs) (tty_menu_activate): * src/xfaces.c (Fx_load_color_file): Use unlocked stdio when it should be safe. * src/sysstdio.h (clearerr_unlocked, feof_unlocked, ferror_unlocked) (fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked) (fread_unlocked, fwrite_unlocked, getc_unlocked, getchar_unlocked) (putc_unlocked, putchar_unloced): Provide substitutes if not declared.
* unidata: don’t check special casing in unidata-check (bug#26656)Michal Nazarewicz2017-06-221-44/+50
| | | | | | | | * admin/unidata/unidata-gen.el (unidata-check): Do not test special casing mapping of characters since that mapping is not constructed from the unidata.txt file. Also, check for integer decoder and cons char earlier so that less unnecessary processing is performed.
* Add command to replace buffer contentsPhilipp Stephani2017-06-171-2/+2
| | | | | | | | | | | | | | | | | Add a new command 'replace-buffer-contents' that uses the Myers diff algorithm to non-destructively replace the accessible portion of the current buffer. The Myers algorithm is implemented in Gnulib. * src/editfns.c (Freplace_buffer_contents): New command. (set_bit, bit_is_set, buffer_chars_equal): New helper functions. (syms_of_editfns): Define new command. * test/src/editfns-tests.el (replace-buffer-contents-1) (replace-buffer-contents-2): New unit tests. * src/buffer.h (BUF_FETCH_CHAR_AS_MULTIBYTE): New helper macro. * admin/merge-gnulib (GNULIB_MODULES): Add diffseq.h and minmax.h.
* More authors.el updatesGlenn Morris2017-06-071-3/+24
| | | | | | | * admin/authors.el (authors-ignored-files, authors-valid-file-names) (authors-renamed-files-alist): Additions. ; ChangeLog fixes
* More authors.el updatesGlenn Morris2017-06-061-4/+18
| | | | | | * admin/authors.el (authors-obsolete-files-regexps) (authors-valid-file-names, authors-renamed-files-alist) (authors-renamed-files-regexps): Additions.
* ; * admin/authors.el (authors-obsolete-files-regexps): Tweak previous.Glenn Morris2017-06-061-1/+1
|
* More small authors.el updatesGlenn Morris2017-06-061-11/+31
| | | | | | | | | | * admin/authors.el (authors-aliases): Fix recent addition. (authors-obsolete-files-regexps, authors-no-scan-regexps) (authors-ignored-files, authors-valid-file-names) (authors-renamed-files-alist): Additions. ; * lisp/vc/pcvs.el, test/lisp/emacs-lisp/checkdoc-tests.el: ; Fix Author headers. ; * ChangeLog.2: Fixes.
* Make authors.el report names that were ignoredGlenn Morris2017-06-051-10/+24
| | | | | | | | | * admin/authors.el (authors-ignored-names): New. (authors-canonical-author-name): Add file and position arguments. Record ignored authors. (authors-scan-change-log, authors-scan-el): Pass file and position to authors-canonical-author-name. (authors): Also print authors that were ignored.
* * admin/authors.el (authors-aliases): Additions.Glenn Morris2017-06-051-4/+4
|
* * admin/authors.el (authors-aliases): Addition.Glenn Morris2017-06-021-0/+2
|
* Improve performance by avoiding strtoumaxPaul Eggert2017-06-011-1/+1
| | | | | | | | | | | | | | | | This made (string-to-number "10") 20% faster on my old desktop, an AMD Phenom II X4 910e running Fedora 25 x86-64. * admin/merge-gnulib (GNULIB_MODULES): Remove strtoumax. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/strtoul.c, lib/strtoull.c, lib/strtoumax.c, m4/strtoull.m4: * m4/strtoumax.m4: Remove. * src/editfns.c (str2num): New function. (styled_format): Use it instead of strtoumax. Use ptrdiff_t instead of uintmax_t. Check for integer overflow. * src/lread.c (LEAD_INT, DOT_CHAR, TRAIL_INT, E_EXP): Move to private scope and make them enums. (string_to_number): Compute integer value directly during first pass instead of revisiting it with strtoumax later.
* * admin/update_autogen: Remove bzr support.Glenn Morris2017-05-301-18/+6
|
* * admin/update_autogen (commit): Pull before push.Glenn Morris2017-05-171-0/+2
|
* Put license information in each generated uni-*.elGlenn Morris2017-05-091-8/+16
| | | | | | | | * admin/unidata/unidata-gen.el (unidata-gen-file): Get Copyright line from copyright.html. Put information in file header, not separate README. (unidata-gen-charprop): Mention the source location. * lisp/international/README: Remove file.
* ; Update contributor nameGlenn Morris2017-05-061-1/+1
| | | | ; Ref http://lists.gnu.org/archive/html/emacs-devel/2017-05/msg00114.html
* Merge from gnulibPaul Eggert2017-05-011-1/+1
| | | | | | | | | | | | | | This incorporates: 2017-05-01 New module 'localtime-buffer' 2017-04-30 utimens: Add support for native Windows * admin/merge-gnulib (AVOIDED_MODULES): Add tzset. * configure.ac (tzset): No need for Emacs itself to check now. * lib/gettimeofday.c, lib/time.in.h, lib/time_rz.c, lib/utimens.c: * m4/gettimeofday.m4, m4/time_h.m4, m4/time_rz.m4: Copy from gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/localtime-buffer.c, lib/localtime-buffer.h: * m4/localtime-buffer.m4: New files, copied from gnulib. * src/editfns.c (init_editfns): Assume tzset is callable.
* Merge from gnulibPaul Eggert2017-04-301-1/+1
| | | | | | | | | | | | | | | | | This incorporates: 2017-04-30 strftime-fixes: New module 2017-04-30 mktime: Work around TZ problem on native Windows 2017-04-30 ctime, localtime: New modules 2017-04-30 gettimeofday: Provide higher resolution on native Windows 2017-04-29 utime-h: Modernize handling of 'struct utimbuf' 2017-04-29 Make use of module 'utime-h' 2017-04-30 Fix a few typos * admin/merge-gnulib (AVOIDED_MODULES): Avoid utime-h, too. * lib/gettimeofday.c, lib/mktime.c, lib/time.in.h, lib/utimens.c: * m4/gettimeofday.m4, m4/include_next.m4, m4/mktime.m4: * m4/strftime.m4, m4/time_h.m4, m4/timegm.m4, m4/utimens.m4: Copy from gnulib. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* Merge from gnulibPaul Eggert2017-04-301-1/+1
| | | | | | | | | This avoids incorporating the following, which I suspect are more trouble for Emacs than they’re worth: 2017-04-29 stat, fstat: fix time_t etc. on native Windows platforms * admin/merge-gnulib (AVOIDED_MODULES): Avoid stat, too. * lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate. * lib/pathmax.h, lib/stat.c, m4/pathmax.m4, m4/stat.m4: Remove.
* Merge from origin/emacs-25Glenn Morris2017-04-272-9/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 784602b1050 (origin/emacs-25) ; Add release notice 3a34412caae (tag: emacs-25.2) Set Emacs version to 25.2 and update AU... 56a4461a48d ; Move stray item from admin/notes/repo to CONTRIBUTE 2b0d1118199 ; CONTRIBUTE: Remove stray header. f2ab09ec60d Fix a typo in indexing the user manual bc55a574235 * lisp/menu-bar.el (kill-this-buffer): Doc fix. (Bug#26466) a6d50401b4b Document 'line-pixel-height' 0c55cf43e61 * search.c (Fre_search_forward, Fre_search_backward): Imp... c7ed57eaef4 Mention that processes start in default-directory (Bug#18... 856ec9ffa1f * src/xdisp.c (vmessage, message): Clarify commentary. 849a0aaa1c9 Belated fixes for admin.el's M-x make-manuals-dist 84938d79698 default-directory: Remark that it must be a directory name 3f0d047d2eb Delete confuse statement in manual ee1bd94dd0c Improve packaging documentation fb18bff91f0 Expand manual section on quitting windows 9a737079645 Fix docstring of dabbrev-abbrev-char-regexp afe8849bac1 * doc/misc/cl.texi (Iteration Clauses): Clarify example (... ada79442c07 ;* doc/misc/info.texi (Choose menu subtopic): Improve ind... d38fd9229c0 Narrow scope of modification hook renabling in org-src fo... e0e9db4c84a ; Spelling fix # Conflicts: # README # etc/AUTHORS # etc/HISTORY # lisp/ldefs-boot.el
| * ; Move stray item from admin/notes/repo to CONTRIBUTENoam Postavsky2017-04-191-7/+0
| | | | | | | | | | * admin/notes/repo: Remove stray item. * CONTRIBUTE: Move it here, fix incorrect references to "branch".
| * Belated fixes for admin.el's M-x make-manuals-distGlenn Morris2017-04-021-2/+7
| | | | | | | | | | * admin/admin.el (make-manuals-dist-output-variables): Additions. (make-manuals-dist--1): Also copy docstyle.texi.
* | Make charprop.el provide a featureGlenn Morris2017-04-261-1/+4
| | | | | | | | | | | | * admin/unidata/unidata-gen.el (unidata-gen-charprop): Provide a feature. * lisp/loadup.el: Use the charprop feature.
* | Generate each unicode lisp file independentlyGlenn Morris2017-04-242-53/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is better for parallel builds, eg it eliminates race conditions from having one process write multiple files. * admin/unidata/Makefile.in (lparen, unifiles): New variables. Parse unidata-gen.el, not charprop.el, to get the list of uni- files. (all): Explicitly list the output lisp files. (PHONY_EXTRAS): Remove. (${unidir}/charprop.el): Change rule to just be for this file. (${unifiles}): New rule to write each unicode lisp file. (extraclean): Simplify. * admin/unidata/unidata-gen.el (unidata-gen-charprop): Quieten in batch mode. (unidata-gen-files): Remove, no longer used. * lisp/loadup.el: Update command-line parser.
* | Further refactoring in unidata-gen.elGlenn Morris2017-04-241-22/+23
| | | | | | | | | | | | * admin/unidata/unidata-gen.el (unidata-gen-charprop): New function, split from unidata-gen-files. (unidata-gen-files): Use unidata-gen-charprop.
* | Allow unidata-gen-file to work independentlyGlenn Morris2017-04-241-34/+42
| | | | | | | | | | | | * admin/unidata/unidata-gen.el (unidata-gen-file): Make it work as a stand-alone function in batch mode. (unidata-gen-files): Pass extra arguments to unidata-gen-file.
* | Preparatory refactoring in unidata-gen.elGlenn Morris2017-04-241-37/+44
| | | | | | | | | | | | * admin/unidata/unidata-gen.el (unidata-gen-file): New function, split from unidata-gen-files. (unidata-gen-files): Use unidata-gen-file.
* | Write each generated character property lisp file only onceGlenn Morris2017-04-241-231/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * admin/unidata/unidata-gen.el (unidata-file-alist): Rename from unidata-prop-alist. All users changed. Use file name rather than property name as the key. (unidata-prop-prop): New function. (unidata-prop-index, unidata-prop-generator, unidata-prop-docstring) (unidata-prop-describer, unidata-prop-default, unidata-prop-val-list): Change to parse the argument rather than unidata-prop-alist. (unidata-gen-table-character, unidata-gen-table) (unidata-gen-table-symbol, unidata-gen-table-integer) (unidata-gen-table-numeric, unidata-gen-table-word-list) (unidata-gen-table-name, unidata-gen-table-decomposition) (unidata-gen-table-special-casing): Pass index as an argument. (unidata-check): Adapt to unidata-file-alist. Pass index to generator functions. (unidata-gen-files): Adapt to unidata-file-alist. Write each output file once only. Overwrite rather than delete.
* | Support casing characters which map into multiple code points (bug#24603)Michal Nazarewicz2017-04-063-0/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement unconditional special casing rules defined in Unicode standard. Among other things, they deal with cases when a single code point is replaced by multiple ones because single character does not exist (e.g. ‘fi’ ligature turning into ‘FL’) or is not commonly used (e.g. ß turning into SS). * admin/unidata/SpecialCasing.txt: New data file pulled from Unicode standard distribution. * admin/unidata/README: Mention SpecialCasing.txt. * admin/unidata/unidata-get.el (unidata-gen-table-special-casing, unidata-gen-table-special-casing--do-load): New functions generating ‘special-uppercase’, ‘special-lowercase’ and ‘special-titlecase’ character Unicode properties built from the SpecialCasing.txt Unicode data file. * src/casefiddle.c (struct casing_str_buf): New structure for representing short strings used to handle one-to-many character mappings. (case_character_imlp): New function which can handle one-to-many character mappings. (case_character, case_single_character): Wrappers for the above functions. The former may map one character to multiple (or no) code points while the latter does what the former used to do (i.e. handles one-to-one mappings only). (do_casify_natnum, do_casify_unibyte_string, do_casify_unibyte_region): Use case_single_character. (do_casify_multibyte_string, do_casify_multibyte_region): Support new features of case_character. * (do_casify_region): Updated to reflact do_casify_multibyte_string changes. (casify_word): Handle situation when one character-length of a word can change affecting where end of the word is. (upcase, capitalize, upcase-initials): Update documentation to mention limitations when working on characters. * test/src/casefiddle-tests.el (casefiddle-tests-char-properties): Add test cases for the newly introduced character properties. (casefiddle-tests-casing): Update test cases which are now passing. * test/lisp/char-fold-tests.el (char-fold--ascii-upcase, char-fold--ascii-downcase): New functions which behave like old ‘upcase’ and ‘downcase’. (char-fold--test-match-exactly): Use the new functions. This is needed because otherwise fi and similar characters are turned into their multi- -character representation. * doc/lispref/strings.texi: Describe issue with casing characters versus strings. * doc/lispref/nonascii.texi: Describe the new character properties.
* | Amend gitmerge to recognize the injunction "don't merge".Alan Mackenzie2017-03-291-1/+1
| | | | | | | | | | * admin/gitmerge.el (gitmerge-skip-regexp): amend regexp to match "don't" as well as "do not".
* | Fix obsolete ‘test/automated’ referencesPaul Eggert2017-03-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in (mostlyclean, clean, maybeclean_dirs, distclean) (bootstrap-clean, maintainer-clean): Clean ‘test’, not ‘test/automated’. Test for existence of subdirectory only for ‘test’, not for directories that should always exist. * admin/MAINTAINERS, etc/TODO, lisp/emacs-lisp/bytecomp.el: * lisp/emacs-lisp/seq.el, lisp/emacs-lisp/thunk.el: * lisp/man.el (Man-parse-man-k): * lisp/url/url-domsuf.el, make-dist: * test/file-organization.org: Fix obsolete references to test/automated.
* | Merge from origin/emacs-25Paul Eggert2017-03-191-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec4226d * lisp/woman.el (woman): Fix docstring prefix arg description. 2b774fa Mention "editor" in Emacs man page header ae60d0c Document problems with nerd-fonts 2fdb5a9 ; Details about pinning Emacs to w32 task bar 5c3105e * doc/lispref/modes.texi (Derived Modes): Make example more i... 4c51ef4 Clarify what is the "cursor" 8303c32 ; * etc/NEWS: Copyedits. 3f7493e ; Fix a typo in comment c54cf8d Improve commentary in lisp.h 8b92f86 ; * admin/make-tarball.txt: Cross-reference admin/release-pro... 0ba9932 Disable native completion for ipython (Bug#25067) 38fc456 Fix a typo in ada-mode manual 00e75ba ; * src/coding.c (Fencode_coding_region): Fix a typo in the d... a541c21 Clarify documentation of 'bufferpos-to-filepos' and 'filepos-... # Conflicts: # etc/NEWS # etc/PROBLEMS
| * ; * admin/make-tarball.txt: Cross-reference admin/release-process.Glenn Morris2017-02-081-3/+6
| |
* | Merge from origin/emacs-25Paul Eggert2017-03-191-0/+4
|\ \ | |/ | | | | 02d9ad8 * admin/make-tarball.txt: Add documentation regarding the rel...
| * * admin/make-tarball.txt: Add documentation regarding the release banner.Nicolas Petton2017-02-031-0/+4
| |
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-28 13:54:10 +0000