summaryrefslogtreecommitdiff
path: root/admin/gitmerge.el
AgeCommit message (Collapse)Author
2026-01-01; Add 2026 to copyright years.Sean Whitton
2025-07-01Revert "admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`"Stefan Monnier
This reverts commit 17d976e22e9b0ba10dcbe1655a93bc4d165d7097 because the change is not worth the risk.
2025-06-30admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`Stefan Monnier
2025-02-21Prefer defvar-keymap in admin/gitmerge.elStefan Kangas
* admin/gitmerge.el (gitmerge-mode-map): Prefer defvar-keymap.
2025-01-01Update copyright year to 2025Paul Eggert
Run "TZ=UTC0 admin/update-copyright".
2024-02-05(gitmerge-mode-font-lock-keywords): Don't use font-lock-*-face varsStefan Monnier
* admin/gitmerge.el (gitmerge-mode-font-lock-keywords): Refer to the faces directly.
2024-01-02Merge from savannah/emacs-29Po Lu
dc4e6b13296 ; Update copyright years in more files 64b37776318 ; Run set-copyright from admin.el 8e1c56ae467 ; Add 2024 to copyright years # Conflicts: # doc/misc/modus-themes.org # doc/misc/texinfo.tex # etc/NEWS # etc/refcards/ru-refcard.tex # etc/themes/modus-operandi-theme.el # etc/themes/modus-themes.el # etc/themes/modus-vivendi-theme.el # lib/alloca.in.h # lib/binary-io.h # lib/c-ctype.h # lib/c-strcasecmp.c # lib/c-strncasecmp.c # lib/careadlinkat.c # lib/cloexec.c # lib/close-stream.c # lib/diffseq.h # lib/dup2.c # lib/filemode.h # lib/fpending.c # lib/fpending.h # lib/fsusage.c # lib/getgroups.c # lib/getloadavg.c # lib/gettext.h # lib/gettime.c # lib/gettimeofday.c # lib/group-member.c # lib/malloc.c # lib/md5-stream.c # lib/md5.c # lib/md5.h # lib/memmem.c # lib/memrchr.c # lib/nanosleep.c # lib/save-cwd.h # lib/sha1.c # lib/sig2str.c # lib/stdlib.in.h # lib/strtoimax.c # lib/strtol.c # lib/strtoll.c # lib/time_r.c # lib/xalloc-oversized.h # lisp/auth-source-pass.el # lisp/emacs-lisp/lisp-mnt.el # lisp/emacs-lisp/timer.el # lisp/info-look.el # lisp/jit-lock.el # lisp/loadhist.el # lisp/mail/rmail.el # lisp/net/ntlm.el # lisp/net/webjump.el # lisp/progmodes/asm-mode.el # lisp/progmodes/project.el # lisp/progmodes/sh-script.el # lisp/textmodes/flyspell.el # lisp/textmodes/reftex-toc.el # lisp/textmodes/reftex.el # lisp/textmodes/tex-mode.el # lisp/url/url-gw.el # m4/alloca.m4 # m4/clock_time.m4 # m4/d-type.m4 # m4/dirent_h.m4 # m4/dup2.m4 # m4/euidaccess.m4 # m4/fchmodat.m4 # m4/filemode.m4 # m4/fsusage.m4 # m4/getgroups.m4 # m4/getloadavg.m4 # m4/getrandom.m4 # m4/gettime.m4 # m4/gettimeofday.m4 # m4/gnulib-common.m4 # m4/group-member.m4 # m4/inttypes.m4 # m4/malloc.m4 # m4/manywarnings.m4 # m4/mempcpy.m4 # m4/memrchr.m4 # m4/mkostemp.m4 # m4/mktime.m4 # m4/nproc.m4 # m4/nstrftime.m4 # m4/pathmax.m4 # m4/pipe2.m4 # m4/pselect.m4 # m4/pthread_sigmask.m4 # m4/readlink.m4 # m4/realloc.m4 # m4/sig2str.m4 # m4/ssize_t.m4 # m4/stat-time.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/stdio_h.m4 # m4/stdlib_h.m4 # m4/stpcpy.m4 # m4/strnlen.m4 # m4/strtoimax.m4 # m4/strtoll.m4 # m4/time_h.m4 # m4/timegm.m4 # m4/timer_time.m4 # m4/timespec.m4 # m4/unistd_h.m4 # m4/warnings.m4 # nt/configure.bat # nt/preprep.c # test/lisp/register-tests.el
2024-01-02; Add 2024 to copyright yearsPo Lu
2023-01-01Merge from origin/emacs-29Eli Zaretskii
cae528457c ; Add 2023 to copyright years. b394359261 Improve documentation of 'isearch-open-overlay-temporary' ab3210e709 Document 'use-package' in the 2 main manuals # Conflicts: # etc/refcards/ru-refcard.tex # lib/explicit_bzero.c # m4/explicit_bzero.m4
2023-01-01; Add 2023 to copyright years.Eli Zaretskii
2022-12-29; Fix byte-compilation warnings in admin/*.elMattias Engdegård
2022-09-21* admin/gitmerge.el (gitmerge): Use substitute-command-keys.Stefan Kangas
2022-09-21Bind 'n'/'p' in gitmerge-mode to line scrollStefan Kangas
* admin/gitmerge.el (gitmerge-mode-map): Bind 'n' and 'p' to 'next-line' and 'previous-line'.
2022-08-23Make point-at-eol and point-at-bol obsoleteStefan Kangas
* lisp/subr.el (point-at-eol, point-at-bol): Make XEmacs compat aliases obsolete in favor of `pos-bol'/'line-beginning-position' or 'pos-eol'/'line-end-position'. Update callers. Ref: https://lists.gnu.org/r/emacs-devel/2022-08/msg00853.html
2022-07-05Adjust better to Autoconf quoting style changePaul Eggert
* admin/gitmerge.el (gitmerge-emacs-version): * admin/nt/dist-build/build-zips.sh (ACTUAL_VERSION): * admin/quick-install-emacs (VERSION): * lisp/cedet/ede/emacs.el (ede-emacs-version): Adjust to change in configure.ac’s Autoconf quoting style. * etc/srecode/ede-autoconf.srt: * test/lisp/progmodes/autoconf-tests.el: (autoconf-tests-current-defun-function-define) (autoconf-tests-current-defun-function-subst): Use better Autoconf quoting. * make-dist (version): Simplify.
2022-01-01Merge from origin/emacs-28Eli Zaretskii
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4
2022-01-01; Add 2022 to copyright years.Eli Zaretskii
2021-11-23Prefer locate-user-emacs-file in gitmerge.elStefan Kangas
* admin/gitmerge.el (gitmerge-status-file): Prefer 'locate-user-emacs-file' to fiddling with 'user-emacs-directory'.
2021-11-21Revert "* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap."Stefan Kangas
This reverts commit 4c467e4aff12e65fa4fa62d7f4bdcbf4a2bcd92c.
2021-11-17* admin/gitmerge.el (gitmerge-mode-map): Convert to defvar-keymap.Stefan Kangas
2021-11-11; * admin/gitmerge.el: Fix typos.Stefan Kangas
2021-11-03Fix encoding issues in gitmerge.el, make it work on MS-WindowsEli Zaretskii
* admin/gitmerge.el (gitmerge-emacs-version, gitmerge-show-log) (gitmerge-show-diff, gitmerge-show-files, gitmerge-missing) (gitmerge-setup-log-buffer, gitmerge-resolve) (gitmerge-commit-message, gitmerge-apply) (gitmerge-resolve-unmerged, gitmerge-repo-clean) (gitmerge-commit): Bind coding-system-for-read/write to the appropriate vc-git values. (gitmerge-apply) [windows-nt]: Pass long merge log messages via a temporary file. (gitmerge): Clarify the description of the "R" flag.
2021-02-08; Minor license statement fixesStefan Kangas
2021-01-31* admin/*.el: Use lexical-bindingStefan Monnier
* admin/admin.el: Use lexical-binding. (manual-misc-manuals): Pass a limit to `looking-back`. (reminder-for-release-blocking-bugs): Don't use `_` for a real variable. * admin/authors.el: Use lexical-binding. (authors-disambiguate-file-name): Remove unused var `parent`. * admin/cus-test.el: * admin/find-gc.el: * admin/gitmerge.el: Use lexical-binding.
2021-01-01Update copyright year to 2021Paul Eggert
Run "TZ=UTC0 admin/update-copyright".
2020-07-29* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.Glenn Morris
2020-01-01Merge from origin/emacs-27Paul Eggert
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
2020-01-01Update copyright year to 2020Paul Eggert
Run "TZ=UTC0 admin/update-copyright $(git ls-files)".
2019-12-30* admin/gitmerge.el (gitmerge-skip-regexp): Be more restrictive.Glenn Morris
2019-03-03Merge diff-font-lock-refine and diff-auto-refine-mode into diff-refineCharles A. Roelli
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.
2018-12-31Merge from origin/emacs-26Paul Eggert
2fcf2df Fix copyright years by hand 26bed8b Update copyright year to 2019 2814292 Fix value of default frame height. (Bug#33921)
2019-01-01Update copyright year to 2019Paul Eggert
Run 'TZ=UTC0 admin/update-copyright $(git ls-files)'.
2018-12-10* admin/gitmerge.el (gitmerge-skip-regexp): Add yet another variant.Glenn Morris
2018-10-24* admin/gitmerge.el (gitmerge-resolve): Check NEWS patch exit status.Glenn Morris
2018-06-18Stop assuming .git is a directory in gitmerge.elNoam Postavsky
* admin/gitmerge.el (gitmerge-maybe-resume): Use 'git rev-parse --git-dir' to find the git directory rather than assuming it is .git/ (that assumption fails for separated worktrees).
2018-01-15Small improvement for noninteractive gitmergeGlenn Morris
* admin/gitmerge.el (gitmerge-resolve-unmerged): In batch mode, report conflicted files.
2018-01-15Small gitmerge-skip-regexp fixGlenn Morris
* admin/gitmerge.el (gitmerge-skip-regexp): Update for new format of "bump version" message that seems to have appeared.
2018-01-01Merge from origin/emacs-26Paul Eggert
63b04c11d5 Fix copyright years by hand 5c7dd8a783 Update copyright year to 2018 220a9ecba1 Merge from Gnulib 312c565566 Don't add empty keyboard macro to macro ring (Bug#24992) 39ca289a7a Allow customization of decoding of "man" command f8240815ea * etc/NEWS: Add security consideration note on passphrase ... 0c78822c70 Fix subtle problem with scroll-down when scroll-margin is ... acd289c5a4 Fix problems with indexing in User manual b240c7846b * lisp/help.el (describe-key): Only (copy-sequence elt) wh... e879a5444a * src/buffer.c (Frestore_buffer_modified_p): Fix bug#29846 81b1028b63 Improve documentation of 'inhibit-modification-hooks' and ... 7175496d7a Fix doc string of 'enable-recursive-minibuffers' 5b38406491 Fix documentation of delsel and of killing text # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
2018-01-01Update copyright year to 2018Paul Eggert
Run admin/update-copyright.
2017-12-18Set minimum number of commits for gitmerge in batch modeGlenn Morris
* admin/gitmerge.el (gitmerge-minimum-missing): New variable. (gitmerge): In batch mode, respect gitmerge-minimum-missing.
2017-12-18* admin/gitmerge.el (gitmerge-skip-regexp): Be stricter in batch mode.Glenn Morris
2017-12-18Make gitmerge usable in batch modeGlenn Morris
* admin/gitmerge.el (gitmerge-missing): Add progress messages. (gitmerge-maybe-resume): In batch mode, never resume. (gitmerge): Handle batch mode.
2017-12-12* admin/gitmerge.el (gitmerge-missing):Glenn Morris
Don't get confused by decorations.
2017-12-12Fix gitmerge handling of automatic conflict reslutionGlenn Morris
* admin/gitmerge.el (gitmerge-resolve): Reenable NEWS handling. (gitmerge-resolve-unmerged): Commit after successful resolution. (gitmerge-commit): New function, extracted from gitmerge-maybe-resume. (gitmerge-maybe-resume): Use gitmerge-commit.
2017-12-11* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.Glenn Morris
2017-12-01* admin/gitmerge.el (gitmerge-resolve): Handle NEWS. (Bug#29366)Glenn Morris
2017-12-01Don't hard-code gitmerge.el's default merge branchGlenn Morris
* admin/gitmerge.el (gitmerge-default-branch): Make it a variable, defaulting to nil. (gitmerge-emacs-version, gitmerge-default-branch): New functions. (gitmerge): Guess the branch to merge from.
2017-12-01* admin/gitmerge.el (gitmerge-resolve):Glenn Morris
Fix treatment of generated files.
2017-11-08Merge from origin/emacs-26Paul Eggert
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t... 98288ecaff Further workaround for faulty localtime() under macOS 10.6
2017-11-08* admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc typo.Glenn Morris
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 07:11:41 +0000