1. 29 Jul, 2020 1 commit
  2. 01 Jan, 2020 1 commit
  3. 30 Dec, 2019 1 commit
  4. 03 Mar, 2019 1 commit
    • Charles A. Roelli's avatar
      Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refine · d6b3e5bb
      Charles A. Roelli authored
      This change was discussed in Bug#32991.
      
      * admin/gitmerge.el (gitmerge-resolve): Bind 'diff-refine'
      instead of 'diff-auto-refine-mode' to nil.
      * doc/emacs/files.texi (Diff Mode): Explain 'diff-refine'
      instead of 'diff-auto-refine-mode' in the documentation of
      'diff-hunk-next' and 'diff-hunk-prev'.  Mention in the
      documentation of 'diff-refine-hunk' that refining is already
      done by default.
      * etc/NEWS (Diff mode): Explain renamed 'diff-refine' variable
      and mention deprecation and disabling of
      'diff-auto-refine-mode'.
      * lisp/vc/diff-mode.el (diff-font-lock-refine): Rename to
      'diff-refine' and allow choices nil, 'font-lock' and 'navigation'.
      (diff-auto-refine-mode): Disable it by default, make it
      obsolete and make it set 'diff-refine' appropriately to keep
      backward compatibility.
      (diff-hunk-next, diff-hunk-prev): Adapt to rename of
      diff-auto-refine-mode and ensure that refining only happens
      when calling these commands interactively.
      (diff--font-lock-refined): Adapt to rename of
      diff-font-lock-refine.
      * lisp/vc/smerge-mode.el (smerge-next, smerge-prev): Check
      that 'diff-refine' is set instead of checking
      'diff-auto-refine-mode' when deciding whether to refine a
      conflict.
      d6b3e5bb
  5. 01 Jan, 2019 1 commit
  6. 10 Dec, 2018 1 commit
  7. 24 Oct, 2018 1 commit
  8. 19 Jun, 2018 1 commit
  9. 15 Jan, 2018 2 commits
  10. 01 Jan, 2018 1 commit
  11. 19 Dec, 2017 3 commits
  12. 13 Dec, 2017 2 commits
  13. 11 Dec, 2017 1 commit
  14. 02 Dec, 2017 3 commits
  15. 08 Nov, 2017 1 commit
  16. 25 Sep, 2017 1 commit
  17. 13 Sep, 2017 1 commit
    • Paul Eggert's avatar
      Prefer HTTPS to FTP and HTTP in documentation · bc511a64
      Paul Eggert authored
      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.
      bc511a64
  18. 29 Mar, 2017 1 commit
  19. 07 Mar, 2017 1 commit
    • Phillip Lord's avatar
      Revert "Replace ldefs-boot with a much smaller file" · 542a7632
      Phillip Lord authored
      This reverts commit c27b6459.
      
      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.
      542a7632
  20. 01 Jan, 2017 1 commit
  21. 13 Dec, 2016 1 commit
    • Phillip Lord's avatar
      Replace ldefs-boot with a much smaller file · c27b6459
      Phillip Lord authored
       * 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.
      c27b6459
  22. 07 Oct, 2016 1 commit
  23. 01 May, 2016 1 commit
  24. 22 Mar, 2016 4 commits
  25. 01 Jan, 2016 1 commit
  26. 26 Dec, 2015 1 commit
  27. 14 Nov, 2015 2 commits
    • David Engster's avatar
      gitmerge: Fix git log command · dcd5877a
      David Engster authored
      * admin/gitmerge.el (gitmerge-missing): Use '--left-only' since we
      only want commits from the branch that is to be merged.
      (gitmerge-setup-log-buffer): Use the same symmetric range as in
      `gitmerge-missing'.
      dcd5877a
    • David Engster's avatar
      gitmerge: Try to detect cherry-picks · 2ac79ae9
      David Engster authored
      * admin/gitmerge.el (gitmerge-default-branch): Change to
      origin/emacs-25.
      (gitmerge-missing): Use symmetric difference ('...') between
      branch and master so that cherry-picks can be detected.
      2ac79ae9
  28. 11 Jun, 2015 1 commit
  29. 05 Jun, 2015 1 commit
  30. 02 Jun, 2015 1 commit