aboutsummaryrefslogtreecommitdiffstats
path: root/admin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge from origin/emacs-25Paul Eggert2017-03-191-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab0a60a ; * CONTRIBUTE (Generating ChangeLog entries): Drop duplicate... 7e02a47 Index byte-compile-debug 7c1e598 Document `byte-compile-debug' in the ELisp manual 4d81eb4 Document variable `byte-compile-debug' 72ef710 Fix call to debugger on assertion failure ae8264c Call modification hooks in org-src fontify buffers b3139da ; Fix last change in doc/lispref/strings.texi c331f39 Improve documentation of 'format' conversions 9f52f67 Remove stale functions from ert manual c416b14 Fix a typo in Eshell manual 06695a0 ; Fix a typo in ediff-merg.el 954e9e9 Improve documentation of hooks related to saving buffers 9fcab85 Improve documentation of auto-save-visited-file-name 2236c53 fix typo in mailcap-mime-extensions 85a3e4e Fix typos in flymake.el a1ef10e More NEWS checking for admin.el's set-version # Conflicts: # lisp/emacs-lisp/bytecomp.el
| * More NEWS checking for admin.el's set-versionGlenn Morris2017-01-171-0/+7
| | | | | | | | | | * admin/admin.el (set-version): Warn if temporary NEWS markup still present in release candidates.
* | Switch from Automake to GNU MakePaul Eggert2017-03-174-22/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emacs assumes GNU Make, and GNU Make has much of the functionality of Automake built-in. The Emacs build process uses Automake primarily because Emacs uses some Gnulib code and Gnulib formerly required Automake. Now that Gnulib no longer requires Automake, Emacs can stop using Automake and this should simplify Emacs maintenance in the future (Bug#26100). Although this patch may look long, most of it is generated automatically: the changes to build-aux/config.guess, build-aux/config.sub, build-aux/install-sh, and lib/gnulib.mk.in are all done by admin/merge-gnulib. * .gitignore: Remove build-aux/ar-lib, build-aux/compile, build-aux/config.guess, build-aux/config.sub, build-aux/depcomp, build-aux/install-sh, build-aux/missing, and lib/Makefile.in, as they are no longer built by autogen.sh. Add lib/gnulib.mk, as it is now built by 'configure'. Remove nt/gnulib.mk, as it is no longer built by 'make'. * INSTALL.REPO, README, admin/make-tarball.txt: Remove mention of Automake. * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL, lib) (AUTOCONF_INPUTS, ACLOCAL_PATH, ACLOCAL_INPUTS) ($(srcdir)/aclocal.m4, AUTOMAKE_INPUTS) ($(srcdir)/lib/Makefile.in, $(srcdir)/nt/gnulib.mk, am--refresh): Remove. ($(MAKEFILE_NAME)): Depend on lib/gnulib.mk.in. ($(srcdir)/configure, $(srcdir)/src/stamp-h.in) ($(srcdir)/src/config.in): Use autogen.sh instead of doing it by hand. * admin/merge-gnulib (AVOIDED_MODULES, avoided_flags)): New vars, to simplify processing of avoided modules. (GNULIB_TOOL_FLAGS): Move --avoid flags into AVOIDED_MODULES. Add --gnu-make, and change makefile name to gnulib.mk.in. Copy config.guess, config.sub, and install-sh too, since Automake no longer does that for us. * admin/notes/copyright: * admin/update_autogen (genfiles): Update list of files. Remove hack for nt/gnulib.mk, a file that is no longer needed. * autogen.sh (progs): Remove Automake. (automake_min): Remove. Build aclocal.m4 so that autoreconf need not use aclocal. * build-aux/config.guess, build-aux/config.sub: * build-aux/install-sh: New files, copied from Gnulib. These are now updated by admin/merge-gnulib instead by autogen.sh. * configure.ac (AC_PROG_MAKE_SET, ACLOCAL_PATH, AM_CONDITIONAL): Remove. (AM_INIT_AUTOMAKE, AM_SILENT_RULES): Remove call. (AC_PROG_CC_C_O): Call this instead of AM_PROG_CC_C_O. (BUILDING_FOR_WINDOWSNT, HYBRID_MALLOC_LIB): Remove; no longer needed. (--disable-silent-rules): New option, since Automake no longer does this for us. (AM_V, AM_DEFAULT_V): Set unconditionally, and do not bother with AM_SUBST_NOTMAKE. (AC_PROG_INSTALL): Add call. (MAKEINFO): Do not bother with the 'missing' program. (MAKEINFO, SYSTEM_TYPE): AC_SUBST. (AC_CONFIG_FILES): Add Makefile, lib/gnulib.mk. (SUBDIR_MAKEFILES): Remove duplication. * lib/Makefile.am: Remove, replacing with: * lib/Makefile.in: New file, with the old Makefile.am contents and with the following changes: (AUTOMAKE_OPTIONS, BUILT_SOURCES, CLEANFILES, EXTRA_DIST) (MOSTLYCLEANDIRS, MOSTLYCLEANFILES, noinst_LIBRARIES, SUFFIXES) (AM_CFLAGS, DEFAULT_INCLUDES, libegnu_a_SOURCES, libegnu_a_LIBADD) (EXTRA_libegnu_a_SOURCES, libegnu_a_SHORTNAME, libegnu_a_CPPFLAGS): Remove. (VPATH, abs_top_builddir, top_builddir, top_srcdir, all, AM_V_AR) (AM_V_CC, AM_V_GEN, AM_V_at, DEPDIR, DEPFLAGS, MKDEPDIR, SYSTEM_TYPE) (libgnu.a, libegnu.a, ETAGS, $(ETAGS), tags, TAGS, clean) (mostlyclean, distclean, bootstrap-clean, maintainer-clean): New macros and rules, since Automake no longer does them. Include ../nt/gnulib-cfg.mk if SYSTEM_TYPE is windows-nt, instead of including ../nt/gnulib.mk if BUILDING_FOR_WINDOWS_NT. Include dependency files if AUTO_DEPEND. (ALL_CFLAGS, AUTOCONF_INPUTS, libgnu_a_OBJECTS, libegnu_a_OBJECTS): New macros. (bootstrap-clean): Depend on distclean, not maintainer-clean, and remove gnulib.mk. (AUTOCONF_INPUTS, $(top_srcdir)/configure, ../config.status, Makefile): New macros and rules, copied from ../Makefile.in. ($(libegnu_a_OBJECTS), $(libgnu_a_OBJECTS)): Depend on BUILT_SOURCES. (.c.o, e-%.o): New generic rules. * lib/gnulib.mk: Remove. * lib/gnulib.mk.in: New file, which is built by autogen.sh and contains much of what used to be in lib/gnulib.mk. * m4/gnulib-common.m4: Copy from gnulib. * make-dist: Do not distribute build-aux/compile, build-aux/depcomp, build-aux/missing, build-aux/ar-lib, lib/Makefile.am, nt/gnulib.mk, nt/gnulib-modules-to-delete.cfg. Distribute lib/Makefile.in, lib/gnulib.mk.in, and nt/gnulib-cfg.mk instead. * nt/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0) (am__v_GEN_1, ${srcdir}/gnulib.mk): Remove. * nt/gnulib-cfg.mk: New file, which supersedes ... * nt/gnulib-modules-to-delete.cfg: ... this file, which is removed. * src/Makefile.in (ACLOCAL_INPUTS): Remove. (AUTOCONF_INPUTS): Merge ACLOCAL_INPUTS into it. ($(top_srcdir)/configure, ../config.status, config.in Makefile): Defer to parent Makefile.
* | Merge from gnulibPaul Eggert2017-03-142-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This incorporates: 2017-03-14 snippets: move unadjusted snippet sources to lib 2017-03-14 gnulib-tool: fix typo in comment output 2017-03-14 snippets: work around GNU Make 3.82 VPATH 2017-03-13 gnulib-tool: minor --gnu-make fixups 2017-03-12 gnulib-tool: new option --gnu-make * .gitignore: Remove lib/arg-nonnull.h, lib/c++defs.h, lib/warn-on-use.h. Change exception from build-aux/snippet/_Noreturn.h to lib/_Noreturn.h. * admin/authors.el (authors-renamed-files-regexps): * admin/notes/copyright, make-dist: The snippet files moved from build-aux/snippet to lib. * lib/_Noreturn.h: Rename from build-aux/snippet/_Noreturn.h. * lib/arg-nonnull.h: Rename from build-aux/snippet/arg-nonnull.h. * lib/c++defs.h: Rename from build-aux/snippet/c++defs.h. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/warn-on-use.h: Rename from build-aux/snippet/warn-on-use.h.
* | Remove some stray gnulib filesPaul Eggert2017-03-121-2/+3
| | | | | | | | | | | | | | | | * admin/merge-gnulib: rm m4/gnulib-tool.m4 too. (GNULIB_MODULES): Remove unsetenv, as it is not needed and the --avoid=unsetenv option avoided most of it anyway. * lib/unsetenv.c, m4/gnulib-tool.m4, m4/setenv.m4: Remove. * lib/gnulib.mk: Regenerate.
* | * admin/update_autogen: Ensure nt/gnulib.mk exists, for autoreconf.Glenn Morris2017-03-071-0/+2
| |
* | Define copysign on all platformsPaul Eggert2017-03-071-1/+0
| | | | | | | | | | | | | | * configure.ac (copysign): Remove test. * src/floatfns.c (signbit): New macro, if not already defined. (Fcopysign): Use it instead of copysign. (Fcopysign, syms_of_floatfns): Define the function on all platforms.
* | Revert "Replace ldefs-boot with a much smaller file"Phillip Lord2017-03-075-78/+16
| | | | | | | | | | | | | | | | | | | | | | This reverts commit c27b645956a11fab1dd8fa189254d525390958f5. This commit has been reverted because the new mechanism was too sensitive to changes in the lisp source, generation of new ldefs-boot files was platform specific and resulted in warnings about undefined variables. See also 11436e2890d.
* | Revert "Record autoloads till emacs dump"Phillip Lord2017-03-071-5/+3
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 72c668a9042ac6475eadedfee5c87fb1e6b2d753. This commit has been reverted because the new mechanism was too sensitive to changes in the lisp source, generation of new ldefs-boot files was platform specific and resulted in warnings about undefined variables. See also 11436e2890d.
* | Revert "Speed generation of ldefs-boot-auto"Phillip Lord2017-03-071-1/+4
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 7b5e1c8238ef961fd3305b1dce053b9bced684ba. This commit has been reverted because the new mechanism was too sensitive to changes in the lisp source, generation of new ldefs-boot files was platform specific and resulted in warnings about undefined variables. See also 11436e2890d.
* | Revert "Fix minor problems with loaddefs autogeneration"Phillip Lord2017-03-071-5/+2
| | | | | | | | | | | | | | | | | | This reverts commit f2bd2c1e6476acc71e71f6cb2a1c56c5edd900ba. This commit has been reverted because the new mechanism was too sensitive to changes in the lisp source, generation of new ldefs-boot files was platform specific and resulted in warnings about undefined variables.
* | Fix minor problems with loaddefs autogenerationEli Zaretskii2017-03-041-2/+5
| | | | | | | | | | | | | | | | * admin/ldefs-clean.el (ldefs-clean): Bind coding-system-for-read and coding-system-for-write, to produce a UTF-8 file with Unix EOLs on MS-Windows. * lisp/ldefs-boot-manual.el (image-type): Add autoload cookie.
* | logb now works correctly on large integersPaul Eggert2017-03-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | * admin/merge-gnulib (GNULIB_MODULES): Add count-leading-zeros. * etc/NEWS: Document the change. * lib/count-leading-zeros.c, lib/count-leading-zeros.h: * m4/count-leading-zeros.m4: New files, copied from Gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * src/floatfns.c: Include count-leading-zeros.h. (Flogb): Do not convert fixnum to float before taking the log, as the rounding error can cause the answer to be off by 1. * src/lisp.h (EMACS_UINT_WIDTH): New constant. * test/src/floatfns-tests.el (logb-extreme-fixnum): New test.
* | Speed generation of ldefs-boot-autoPhillip Lord2017-02-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previously, generation of ldefs-boot-auto required at least one full bootstrap and, in extreme cases, two. Now, from build system, it requires the same time as taken to dump Emacs. * Makefile.in: Remove all calls, pass to src. * admin/ldefs-clean.el: Update for changed messages. * lisp/Makefile.in (compile-first-delete): Add. * lisp/ldefs-boot-auto.el: Update. * src/Makefile.in (generate-ldefs-boot): Add.
* | Remove the build number from emacs-version variableGlenn Morris2017-02-171-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a largely internal detail that can confuse users. (Bug#25590) * lisp/version.el (emacs-build-number): New constant. (emacs-version): Use emacs-build-number. * lisp/loadup.el (top-level): When dumping, increment emacs-build-number rather than emacs-version. * src/emacs.c (emacs-version): Doc fix. * doc/lispref/intro.texi (Version Info): Update emacs-version details. Mention emacs-build-number. * lisp/gnus/gnus-util.el (gnus-emacs-version): * lisp/mail/emacsbug.el (report-emacs-bug): * admin/admin.el (set-version): Update for emacs-version change. ; * etc/NEWS: Mention this.
* | Remove immediate_quit.Paul Eggert2017-02-011-3/+2
| | | | | | | | | | | | | | | | | | The old code that sets and clears immediate_quit was ineffective except when Emacs is running in terminal mode, and has problematic race conditions anyway, so remove it. This will introduce some hangs when Emacs runs in terminal mode, and these hangs should be fixed in followup patches. * src/keyboard.c (immediate_quit): Remove. All uses removed.
* | Record autoloads till emacs dumpPhillip Lord2017-01-131-3/+5
| | | | | | | | | | | | | | | | | | | | * admin/ldefs-clean.el (ldefs-clean-up): Record autoloads till emacs dump * lisp/ldefs-boot-auto.el (batch-byte-compile): Update Previously, autoloads were collected till loaddefs.el was generated as part of the build. However, bootstrap-emacs does not load loaddefs (rather it is dumped), hence we must record autoloads until the full emacs binary is dumped.
* | Do not use Gnulib’s m4/wint_t.m4.Paul Eggert2017-01-011-1/+1
| | | | | | | | | | | | | | * admin/merge-gnulib: Remove m4/wint_t.m4 when merging. Fix typo so that warn-on-use.m4 is removed too. * configure.ac (gt_TYPE_WINT_T): New macro, replacing Gnulib’s. * m4/wint_t.m4: Remove.
* | Update copyright year to 2017 in masterPaul Eggert2017-01-012-2/+2
| | | | | | | | | | | | Run admin/update-copyright in the master branch. This fixes files that were not already fixed in the emacs-25 branch before it was merged here.
* | Merge from origin/emacs-25Paul Eggert2017-01-0141-41/+41
|\ \ | |/ | | | | | | 2e2a806 Fix copyright years by hand 5badc81 Update copyright year to 2017
| * Update copyright year to 2017Paul Eggert2016-12-3141-41/+41
| | | | | | | | Run admin/update-copyright.
* | last-chance: Also ignore NEWS files + typo fixesThien-Thi Nguyen2016-12-301-2/+3
| | | | | | | | | | | | * admin/last-chance.el: Fix typo in copyright notice. (last-chance-uninteresting-regexps): Add entry to match NEWS files. (last-chance-cleanup): Fix typo in docstring.
* | last-chance: new utility lib for dangling deterrenceThien-Thi Nguyen2016-12-241-0/+122
| | | | | | | | * admin/last-chance.el: New file.
* | Replace ldefs-boot with a much smaller filePhillip Lord2016-12-135-16/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in (bootstrap-build,generate-ldefs-boot): New targets. (bootstrap): Depend on bootstrap-build. * admin/ldefs-clean.el: New file. * lisp/Makefile.in (compile-first): Depend on loaddefs.el * lisp/ldefs-boot.el: Remove. * lisp/ldefs-boot-auto.el: New file. * lisp/ldefs-boot-manual.el: New file. * lisp/loadup.el: Load ldefs-boot-manual.el. * src/emacs.c (generating_ldefs_boot): New variable. (main): Check whether we are generating ldefs. * src/eval.c (autoload-do-load): Dump autoload forms to stderr when requested. * src/lisp.h (generating_ldefs_boot): New variable. * admin/gitmerge.el, admin/make-tarball.txt, admin/notes/copyright, lisp/Makefile.in, lisp/cus-dep.el, lisp/emacs-lisp/elint.el, lisp/finder.el, lisp/loadup.el, msdos/mainmake.v2: Update reference to ldefs-boot. * admin/update_autogen: Alter mechanism for ldefs-boot generation.
* | Merge from origin/emacs-25Paul Eggert2016-12-071-1/+1
|\ \ | |/ | | | | | | | | 9a857b9 * admin/authors.el (authors-renamed-files-alist): Addition. 6d27423 Tweak refcard note about documentation location e46a134 Improve treatment of Fortran's "class is"
| * * admin/authors.el (authors-renamed-files-alist): Addition.Nicolas Petton2016-11-281-1/+1
| |
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | 93c0f51 Handle TeX comments when making new paragraph e0884f1 Restore keystroke echo in 'C-q' a6213ce Improve documentation of 'current-word' 0828126 Fix a typo in an Eshell defcustom 2e361c7 Minor copyedits of electric-pair-mode 7499ee8 ; Minor copyedit in the Emacs manual 45b652b Fix documentation of 'invocation-directory' 7f43d7c * admin/authors.el (authors-aliases): Add an entry. ba48880 ; Fix pl-refcard.tex
| * * admin/authors.el (authors-aliases): Add an entry.Glenn Morris2016-11-231-0/+1
| |
* | Merge from origin/emacs-25Paul Eggert2016-12-071-0/+2
|\ \ | |/ | | | | | | | | | | 3d63b48 Update ChangeLog files and authors.el 9d30264 Fix menu bindings of Dired 'A' and 'Q' commands a725592 Avoid errors in shr-pixel-column due to dedicated windows 3138598 Update format-time-string documentation
| * Update ChangeLog files and authors.elNicolas Petton2016-11-211-0/+2
| | | | | | | | | | | | * admin/authors.el (authors-renamed-files-alist): Add entries for obsolete files. * ChangeLog.2: Update.
* | Merge from origin/emacs-25Paul Eggert2016-11-191-5/+4
|\ \ | |/ | | | | | | | | | | | | | | | | 07f45d7 ; Spelling fix 1a210f0 * admin/release-process: Update versions and blocking bug num... 36bafc9 Improve documentation of functions that accept time values # Conflicts: # admin/release-process # src/editfns.c
| * * admin/release-process: Update versions and blocking bug numbers.Eli Zaretskii2016-11-191-4/+4
| |
* | Merge from origin/emacs-25Paul Eggert2016-11-192-2/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4af5981 Add a comment in generated refcards about the source ef880a5 ; * etc/refcards/calccard.tex: Remove obsolete comment. 4887e7c js-mode: Fix indent problem after a regexp e992ac0 Fix sluggish display of symbols in UTF-8 language environment 1fc101b Don't confuse how Texinfo outputs @var with the input 91aa5d1 * doc/lispref/display.texi (Scroll Bars): * doc/lispref/frame... f758fcd * doc/emacs/cmdargs.texi (Initial Options): Copyedit for --da... 5b0cddd More fixes in copyright notices in etc/refcards/ f994c20 Update copyright text in refcards 9ad2ae7 Fix Outline command names 26c3554 Send text received by bracketed paste to process db0b58d Correct the statement about programming modes always running ... 78aece4 Improve documentation of 'occur' eb364fd Do call debugger on failed cl-assert 3ef4ee8 Avoid infloop in python 8da810f Don't refer to obsolete FEATURE-unload-hook 4f478ca Improve documentation of dabbrevs 7272e5d * lisp/chistory.el (list-command-history): Doc fix. (Bug#24890) 89b7482 * lisp/simple.el (set-mark-command): Doc fix. (Bug#24890) 3b199f7 Improve documentation of some Help commands 93d3a0e Fix documentation of yes-or-no prompts af04919 Fix documentation of partial completion style ed80184 Fix documentation of the mode line on emacsclient frames e6be855 Fix description of 'C-z' in User manual 16f7007 Improve and clarify documentation of Outline Mode 31d93aa Add Emacs version number to nt/README.W32 0b6b815 Fix python-mode hideshow regexp dc152c5 Modernize usage of 'macOS' in doc and comments 84c5343 Prefer comments /* like this */ in C code bb61e50 * doc/lispref/loading.texi (Autoload): Better link (Bug#24845). 3ef86fd Clarify documentation of face attribute functions de51d59 ; * nt/README.W32: Minor copyedits. db436e9 Don't call debug on failed cl-assert # Conflicts: # doc/emacs/cmdargs.texi # etc/NEWS # etc/PROBLEMS # lisp/auth-source.el # lisp/net/tramp-sh.el
| * Add Emacs version number to nt/README.W32Eli Zaretskii2016-11-061-0/+3
| | | | | | | | | | | | | | * nt/README.W32: Include the version number of the latest Emacs release. * admin/admin.el (set-version): Update the version in nt/README.W32.
| * Modernize usage of 'macOS' in doc and commentsPaul Eggert2016-11-061-2/+2
| | | | | | | | | | | | | | | | Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct.
* | Merge from origin/emacs-25Paul Eggert2016-10-231-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | b73f466 * lisp/cus-start.el (exec-path): Handle nil elements. (Bug#2... 55ebb70 Catch the imenu-unavailable error in sh-mode completion table 993acb5 ; Minor fix for last change in characters.el 30c4bb5 More char-width fixes 4eb4463 Fix char-width-table values for some Emoji 528997d Keep point when switching from and to *terminal* buffer 2130005 * INSTALL: Use correct Emacs release number 25. 10835b1 Avoid crashes due to objects read with the #n=object form 4de671d Improve doc string of 'completion-at-point-functions' ceb46f0 Fix crash in evaluating functions d8374c4 * src/filelock.c (current_lock_owner): Update comment.
| * Fix char-width-table values for some EmojiEli Zaretskii2016-10-151-0/+4
| | | | | | | | | | | | | | | | * lisp/international/characters.el (char-width-table): Add missing range U+1F400..U+1F43E. (Bug#24699) * admin/notes/unicode: Mention the need to verify char-width-table setting against data in EastAsianWidth.txt.
| * gitmerge: Add cherry pick to gitmerge-skip-regexpDavid Engster2016-10-061-2/+4
| | | | | | | | | | | | | | * gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit", which is the string appended by 'git cherry-pick -x'. (cherry picked from commit f648e4866981b142fca788372e1fd9013a0bb16a)
* | * admin/notes/bug-triage: Do not mention closed bugsMichael Albinus2016-09-271-4/+2
| | | | | | | | | | * admin/notes/bug-triage: Do not mention closed bugs, they are suppressed by default in debbugs-{gnu,org}.
* | Stick with debbugs-supported tags in triagePaul Eggert2016-09-261-8/+8
| | | | | | | | | | | | * admin/notes/bug-triage: Stick to the tag "unreproducible", which debbugs supports, rather than suggesting "doneunreproducible" or "unreproducable".
* | Merge from origin/emacs-25Paul Eggert2016-09-261-5/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | cf9e174 Document the optional zlib library in MS-Windows builds 84eb144 ; * admin/notes/unicode: Mention BidiCharacterTest.txt. 73c67dd Fix tagging of DEFUN by etags ea1960b Avoid resetting track-mouse by mouse clicks 505fef3 Improve nt/README.W32 instructions 1229cc4 Document that desktop file overrides frame parameters f0eb70d ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 release # Conflicts: # ChangeLog.2 # admin/notes/unicode # lisp/ldefs-boot.el
| * ; * admin/notes/unicode: Mention BidiCharacterTest.txt.Eli Zaretskii2016-09-211-4/+9
| |
* | Merge from origin/emacs-25Paul Eggert2016-09-261-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ffc9ce Update admin/authors.el 0ad7410 Update Antinews in ELisp manual ea0f750 Fix comments on window height macros 0bbdeed Fix 'url-http-create-request' when cookies are used 0045998 Fix cross reference in frames.texi 1392894 ; * etc/DEBUG: Minor copyedits. 304a5c8 ; * etc/DEBUG: Improve documentation of getting control to GDB. 56bf7d7 Fix regexp-opt documentation (bug #17862) 803ad6f ; Fix documentation of seq-subseq ed4530d * lisp/emacs-lisp/gv.el (gv-ref): Fix example of PLACE in doc... 88ea396 ; Spelling fixes 17197d0 Fix tags-query-replace docstring 80a7f8b Clarify documentation of precision in format specs 88a5052 Improve and clarify documentation of subprocesses 89eb09f * etc/PROBLEMS: Mention gnutls-cli 3.5.3 (Bug#24247). # Conflicts: # etc/PROBLEMS # src/process.c
| * Update admin/authors.elEli Zaretskii2016-09-151-0/+2
| | | | | | | | | | * admin/authors.el (authors-fixed-entries): Add an entry for Bob Weiner.