procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
128250 commits 1 branch 0 tags 943 MiB
Commit graph

21 commits

Author SHA1 Message Date
Paul Eggert
bcf244ef9b Merge from origin/emacs-25 
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
 2017-01-01 01:10:47 -08:00
Paul Eggert
5badc81c1c Update copyright year to 2017 
Run admin/update-copyright.
 2016-12-31 19:42:26 -08:00
Phillip Lord
c27b645956 Replace ldefs-boot with a much smaller file 
* 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.
 2016-12-13 22:15:32 +00:00
David Engster
a6e0a67701 gitmerge: Add cherry pick to gitmerge-skip-regexp 
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
  which is the string appended by 'git cherry-pick -x'.

(cherry picked from commit f648e48669)
 2016-10-06 21:39:55 -04:00
David Engster
f648e48669 gitmerge: Add cherry pick to gitmerge-skip-regexp 
* gitmerge.el (gitmerge-skip-regexp): Add "cherry picked from commit",
  which is the string appended by 'git cherry-pick -x'.
 2016-05-01 21:17:55 +02:00
Paul Eggert
ddd9111a90 Compute a better commit message for merges 
Problem reported by David Engster in:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01270.html
* admin/gitmerge.el (gitmerge-commit-message):
Truncate the computed commit message to at most 72 characters per line.
(gitmerge-maybe-resume): Don’t use "-" as the commit message for
merges; use the computed commit message instead.
 2016-03-22 16:42:42 -07:00
Paul Eggert
4fab26ba5a * admin/gitmerge.el (gitmerge-skip-regexp): Add "no need to merge". 2016-03-22 15:46:49 -07:00
Paul Eggert
b08237185e Change do-not-merge pattern to "do not merge" 
This should avoid the problem we recently had with
automatically-generated merge messages, while still letting people
specify commits not to merge.
* admin/gitmerge.el (gitmerge-skip-regexp): Add "do not merge".
(gitmerge-highlight-skip-regexp): Fold case when searching
for gitmerge-skip-regexp.
 2016-03-22 12:57:24 -07:00
Paul Eggert
6bd1e22034 Keep "merge" commits by default in gitmerge 
* admin/gitmerge.el (gitmerge-skip-regexp): Omit "merge", as it
causes false positives.  See:
http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01234.html
 2016-03-22 10:52:54 -07:00
John Wiegley
1dd4f26ab6 Merge from origin/emacs-25 
ef33bc7 Spelling and grammar fixes
9c3dbab Fix copyright years by hand
0e96320 Update copyright year to 2016
 2016-01-11 22:48:07 -08:00
Paul Eggert
0e963201d0 Update copyright year to 2016 
Run admin/update-copyright.
 2016-01-01 01:34:24 -08:00
Stefan Monnier
de88375991 * admin/gitmerge.el: Tweaks that seemed necessary 
* admin/gitmerge.el (gitmerge-skip-regexp): Remove "sync".
(gitmerge-maybe-resume): Provide explicit empty commit message.
 2015-12-25 23:37:36 -05:00
David Engster
dcd5877a76 gitmerge: Fix git log command 
* 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'.
 2015-11-14 23:16:51 +01:00
David Engster
2ac79ae901 gitmerge: Try to detect cherry-picks 
* 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.
 2015-11-14 17:54:36 +01:00
Glenn Morris
62afb85efb Improve generated ChangeLog for gitmerge.el commits. (Bug#20717) 
* build-aux/gitlog-to-changelog: Handle gitmerge.el skipped commits.

* admin/gitmerge.el (gitmerge-commit-message):
Exclude "skipped" messages from ChangeLog once again.

; * ChangLog.2: Related fixes.
 2015-06-10 21:13:51 -04:00
Glenn Morris
5977a07d94 * admin/gitmerge.el (gitmerge-commit-message): 
Revert to including "skipped" messages in ChangeLog once again.
 2015-06-05 18:10:07 -04:00
Glenn Morris
9b97b0402c * admin/gitmerge.el (gitmerge-commit-message): 
Exclude "skipped" messages from ChangeLog.
 2015-06-01 23:16:03 -07:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015 
Run admin/update-copyright.
 2015-01-01 14:26:41 -08:00
Stefan Monnier
fca389d1d3 Merge from emacs-24 2014-12-05 15:20:02 -05:00
Paul Eggert
dbff8fd118 Spelling fix. 2014-11-28 23:55:17 -08:00
David Engster
f42adad94b admin: Add gitmerge.el 
* gitmerge.el: New file.
 2014-11-27 18:22:00 +01:00