mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity
124,849 Commits 229 Branches 190 Tags 667 MiB
805204f3ef
Commit Graph

29 Commits

Author SHA1 Message Date
Paul Eggert
0e963201d0 Update copyright year to 2016 
Run admin/update-copyright.
 2016-01-01 01:34:24 -08:00
Paul Eggert
862561f4a6 ‘text-quoting-style’ fixes for admin 
* admin/admin.el (cusver-scan, cusver-check):
* admin/authors.el (authors-canonical-file-name):
* admin/bzrmerge.el (bzrmerge-missing):
Respect ‘text-quoting-style’ in diagnostics.
 2015-08-27 02:37:35 -07:00
Paul Eggert
7e09ef09a4 Update copyright year to 2015 
Run admin/update-copyright.
 2015-01-01 14:26:41 -08:00
Paul Eggert
ba3189039a Update copyright year to 2014 by running admin/update-copyright. 2014-01-01 07:43:34 +00:00
Stefan Monnier
78be8b6465 Merge from emacs-24 2013-03-16 18:08:22 -04:00
Paul Eggert
50d8b29da3 * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic. 
If there were a real need, it should be UTF-8 anyway.
 2013-03-02 23:26:39 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Glenn Morris
a3f90bea8e * admin/bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree. 2012-08-28 15:26:41 -04:00
Chong Yidong
5725bd2cc0 Merge from emacs-24; up to 2012-05-02T11:38:01Z!lekktu@gmail.com 2012-08-11 10:13:55 +08:00
Glenn Morris
23c726f65a * admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:. 2012-08-09 23:57:34 -07:00
Stefan Monnier
4dc7c8d579 Merge from emacs-24 2012-07-17 07:52:00 -04:00
Stefan Monnier
f58e0fd503 Reduce use of (require 'cl). 
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
 2012-07-10 07:51:54 -04:00
Glenn Morris
6116bd7e7a * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "Auto-commit". 2012-05-02 00:12:52 -07:00
Glenn Morris
c9279dad0b * admin/bzrmerge.el (bzrmerge-skip-regexp): Add "from trunk". 
Add header keyword.
 2012-04-10 13:27:01 -04:00
Glenn Morris
54de86ac62 Small bzrmerge.el change. 
* admin/bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer
to the "skip?" question, since there can be multiple such for any revision.
 2012-01-18 22:42:57 -08:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Glenn Morris
2a35386df4 * admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals. 2011-05-21 14:19:30 -07:00
Glenn Morris
59af988b40 Add comments about fixing dates in merged ChangeLogs. 2011-02-22 19:50:04 -08:00
Glenn Morris
7b24e97ab5 * admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. 2011-02-12 15:37:43 -08:00
Glenn Morris
4d881c8341 bzrmerge.el trivia. 
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
 2011-02-05 14:46:34 -08:00
Glenn Morris
f6041baa9d bzrmerge.el trivia. 
* admin/bzrmerge.el (bzrmerge-buffer): New constant.
(bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
(bzrmerge-missing): If nothing to do, return nil not (nil).
(bzrmerge-apply): Remove odd character from message.
(bzrmerge): Give status messages.
 2011-02-02 23:09:50 -08:00
Glenn Morris
d0cb866238 Make it easier to control which revisions bzrmerge might skip. 
* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
 2011-01-24 21:10:02 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
acce4a473a * admin/bzrmerge.el: Fix paren typo in previous. 2011-01-17 18:35:23 -08:00
Stefan Monnier
41f44310b3 * admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in 
an inconsistent state.
 2011-01-17 16:18:00 -05:00
Glenn Morris
6fffc9003c bzrmerge.el trivia. 
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
 2011-01-15 12:42:23 -08:00
Glenn Morris
1851cac3e3 * admin/bzrmerge.el: Require cl when compiling. 
(bzrmerge-merges): Doc fix.
 2011-01-13 18:44:25 -08:00
Glenn Morris
529ee9edf2 * admin/bzrmerge.el: Standardize copyright and license headers. 2011-01-11 20:28:12 -08:00
Stefan Monnier
9ebea0e746 * admin/bzrmerge.el: New file to help merge branches while skipping 
some revisions (e.g. from emacs-23 to trunk).
 2010-12-26 20:27:08 -05:00