aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Document the release processXue Fuqiao2015-11-152-6/+9
| | | | | | | | | * admin/notes/versioning: Add information about RC releases. * admin/release-process: Document the release process. * admin/authors.el (authors-ignored-files): * admin/README: Change FOR-RELEASE to release-process. * CONTRIBUTE: * admin/notes/bugtracker: Don't mention FOR-RELEASE.
* * admin/notes/repo: Fix a few obsolete references to BazaarJuanma Barranquero2015-11-061-2/+2
|
* ; admin/notes/unicode: Update for latest changes.Eli Zaretskii2015-10-101-5/+6
|
* Prefer straight quoting in some text filesPaul Eggert2015-09-119-106/+102
| | | | | | | | | Mostly this just changes ` to ' in static text. Some exceptions: * INSTALL.REPO: Use curved quotes, as the diagnostic in question typically does that now. * admin/quick-install-emacs (TRY, top level): Use straight quoting in diagnostics. * src/README: Fix working-directory confusion.
* * CONTRIBUTE: Move send-email here from git-workflow.Paul Eggert2015-09-111-12/+2
|
* Add patch-sending instructions to git-workflowPaul Eggert2015-09-101-0/+18
| | | | | | From a suggestion by Mitchel Humpherys in: http://lists.gnu.org/archive/html/emacs-devel/2015-09/msg00421.html * admin/notes/git-workflow (Sending patches): New section.
* Convert lisp/term/x-win.el to UTF-8Paul Eggert2015-08-161-1/+0
| | | | | | | * lisp/term/x-win.el: Convert to UTF-8. This doesn't affect runtime behavior, and the file is multilingual so compile-time appearance shouldn't be an issue. * admin/notes/unicode: Document this.
* * admin/notes/unicode: New section "binary files".Paul Eggert2015-05-171-0/+19
|
* Update source file encoding listPaul Eggert2015-04-282-4/+6
| | | | | | | | | | | | | | | | | Update admin/notes/unicode, along with coding system cookies in other files, so that the two match each other better. * admin/notes/unicode: lisp/language/ethio-util.el and lisp/language/ethiopic.el also use utf-8-emacs. * admin/notes/hydra, doc/misc/dbus.texi, doc/misc/org.texi: * doc/misc/remember.texi, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex: Add "coding: utf-8" so that this file is not mishandled in a Latin-1 or Big-5 locale. * lisp/international/robin.el, lisp/org/ox-ascii.el: Specify utf-8, not utf-8-emacs, as these are plain UTF-8 files. * lisp/language/ethio-util.el: Fix trailer.
* Generate a ChangeLog file from commit logsPaul Eggert2015-04-071-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .gitignore: Add 'ChangeLog'. * build-aux/gitlog-to-changelog: New file, from Gnulib. * build-aux/gitlog-to-emacslog: New file. * CONTRIBUTE: Document the revised workflow. * Makefile.in (clean): Remove *.tmp and etc/*.tmp* instead of just special cases. (CHANGELOG_HISTORY_INDEX_MAX, CHANGELOG_N, gen_origin): New vars. (ChangeLog, unchanged-history-files, change-history) (change-history-commit): New rules. * admin/admin.el (make-manuals-dist--1): Don't worry about doc/ChangeLog. * admin/authors.el: Add a FIXME. * admin/make-tarball.txt: * lisp/calendar/icalendar.el: * lisp/gnus/deuglify.el: * lisp/obsolete/gulp.el: * lwlib/README: Adjust to renamed ChangeLog history files. * admin/merge-gnulib (GNULIB_MODULES): Add gitlog-to-changelog. * admin/notes/repo: Call it 'master' a la Git, not 'trunk' a la Bzr. Remove obsolete discussion of merging ChangeLog files. New section "Maintaining ChangeLog history". * build-aux/git-hooks/pre-commit: Reject attempts to commit files named 'ChangeLog'. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * make-dist: Make and distribute top-level ChangeLog if there's a .git directory. Distribute the new ChangeLog history files instead of scattered ChangeLog files. Distribute the new files gitlog-to-changelog and gitlog-to-emacslog. Fixes: bug#19113
* Merge from origin/emacs-24Paul Eggert2015-03-031-0/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f160106 Avoid assertion violations in Rmail due to newline cache 1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote 1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925) 0260932 Bump python.el version b0adfc7 Spelling fixes 35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks. 6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching 65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged. 86fe750 # Remove NEWS temporary markup 4fa778b erc.el: Add old version header for package.el compatibilty 9366f05 Tramp: Disable paging with PAGER=cat Conflicts: admin/notes/repo etc/NEWS lisp/ChangeLog lisp/erc/ChangeLog src/ChangeLog
| * Mention in admin/notes/repo how to mark commits that are not to be merged.Eli Zaretskii2015-02-191-1/+3
| |
| * Update copyright year to 2015Paul Eggert2015-01-017-7/+7
| | | | | | | | Run admin/update-copyright.
* | Update copyright year to 2015Paul Eggert2015-01-016-6/+6
| | | | | | | | Run admin/update-copyright.
* | * notes/unicode: Correct coding systemPaul Eggert2014-12-141-1/+5
| | | | | | | | of lisp/international/titdic-cnv.el.
* | * notes/unicode: Track leim/quail file renames.Paul Eggert2014-12-131-7/+7
| |
* | Convert Czech and Slovakian refcards to UTF-8Paul Eggert2014-12-131-13/+0
| | | | | | | | | | | | | | | | | | * admin/notes/unicode: Don't mention Czech and Slovakian refcards. * etc/refcards/cs-dired-ref.tex, etc/refcards/cs-refcard.tex: * etc/refcards/cs-survival.tex, etc/refcards/sk-dired-ref.tex: * etc/refcards/sk-refcard.tex, etc/refcards/sk-survival.tex: Convert from iso-latin-2 to utf-8. Remove no-longer-necessary coding comments and "\input utf8off" directives.
* | Improve CONTRIBUTE and related files.Stephen Leake2014-12-062-162/+0
| | | | | | | | | | | | | | | | | | | | | | * CONTRIBUTE: improve; add explicit web references, move some info from admin/notes/* here. * INSTALL.REPO: You can't "just run make" after a clean checkout. * admin/notes/commits: deleted; merged into ./CONTRIBUTE * admin/notes/repo: move commit, branch info into ./CONTRIBUTE
* | Merge branch 'emacs-24'.Paul Eggert2014-11-285-45/+41
|\ \ | |/
| * Lessen focus on ChangeLog files, as opposed to change log entries.Paul Eggert2014-11-195-36/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation for generating the former automatically from the latter. * admin/notes/bugtracker, admin/notes/copyright, admin/notes/newfile: ChangeLog -> change log * admin/notes/changelogs: Remove, merging old contents to ... * admin/notes/repo: ... here. * doc/emacs/maintaining.texi (Change Log): Mention that ChangeLog files may be copied to or from a version control system. * doc/emacs/trouble.texi (Sending Patches): Point to the commit messages. * doc/lispref/intro.texi (Acknowledgments): ChangeLog file -> change log entries. * doc/lispref/tips.texi (Library Headers): Emacs uses a version control system. * etc/CONTRIBUTE: Give advice about git commit messages and how to generate proposed patches containing them.
| * Git transition patchEric S. Raymond2014-11-113-1343/+1028
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version stamps. All .cvsignore files in the history became .gitignore files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>. The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>) Committer/author email addresses are generally correct for the transition day, not necessarily when the commit was originally made.
* | admin: Add documentation for gitmerge.elDavid Engster2014-11-271-5/+51
| | | | | | | | | | * gitmerge.el: New file. * notes/git-workflow: Add documentation for using it.
* | Set the push default to "current", which should work everywhereLars Magne Ingebrigtsen2014-11-161-0/+2
| |
* | Mention how to get rid of X11 warningsLars Magne Ingebrigtsen2014-11-161-0/+15
| |
* | Use cherry-pick -xe instead of git log amendLars Magne Ingebrigtsen2014-11-151-2/+1
| |
* | Add a draft of a very simple git workflowLars Magne Ingebrigtsen2014-11-151-0/+73
| |
* | Git transition patchEric S. Raymond2014-11-113-1374/+1036
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All bzr revision IDS, and all CVS revision IDs for which a commit could be identified, were changed to time-date!committer version stamps. All .cvsignore files in the history became .gitignore files. Fixes-bug annotations from bzr were copied into the corresponding commit comments. (The first .cvsignore commit was 1999-09-30T14:07:54Z!fx@gnu.org>. The last CVS commit was <2009-12-27T08:11:12Z!cyd@stupidchicken.com>) Committer/author email addresses are generally correct for the transition day, not necessarily when the commit was originally made.
* | Spelling fixes; tweak explanation of commit messages.Paul Eggert2014-11-041-8/+11
| | | | | | | | | | | | | | * admin/notes/repo: Avoid "DVCS" acronym without first explaining it. Mention using the first line of a ChangeLog as the topic line, and that commit messages should use UTF-8. * lisp/mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
* | Merge from emacs-24; up to 117656Glenn Morris2014-11-011-11/+8
|\ \ | |/
| * Minor fixes in the changes in preparation for git migration.Eli Zaretskii2014-10-311-11/+8
| | | | | | | | | | | | | | | | | | src/Makefile.in (repo-update): Fix a typo and slightly reword commentary. admin/notes/repo (Notes): Reword the stylistic guidance for commit log messages so that they are in line with Emacs development practices and style guidance.
| * Backport from trunk more changes in preparation for git migration.Eric S. Raymond2014-10-311-26/+46
| | | | | | | | | | | | | | | | | | | | admin/notes/bzr: Renamed to notes/repo, reorganixed to separate VCS-dependent from VCS-independent stuff. Added guidance about commit-comment format under DVCSes. admin/notes/BRANCH: Merged into notes/repo. lisp/version.el: Fix some fallback values to conform to the actual release number.
| * Backport changes in preparation for git migration from trunk.Eric S. Raymond2014-10-315-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | admin: Changes in several documents. autogen.sh: Neutralize language specific to a repository type. doc/misc/efaq-w32.texi: Neutralized language specific to a repository type. doc/misc/gnus-coding.txt: Neutralized language specific to a repository type. lisp/Makefile.in: Change some production names so they're neutral about the repository type.
* | Guidance on commit-comment formats.Eric S. Raymond2014-10-261-0/+18
| |
* | More preparation for git tramsition. Reorganize to sparate our dependencies.Eric S. Raymond2014-10-261-26/+28
| |
* | Merge BRANCH into repo, because it belongs with the developer advice. Also...Eric S. Raymond2014-10-262-32/+36
| | | | | | | | ...this helps prepare for the repository move.
* | Neutralize some language specific to a repository type.Eric S. Raymond2014-10-261-1/+1
| |
* | Rename the 'bzr' notes file to 'repo'. For two reasons:Eric S. Raymond2014-10-261-1/+1
| | | | | | | | | | | | | | | | 1. A significant portion of the advice is independent of any specific version-control sytem. 2. Doing the rename now means it is easier to compose a multi-file patch that can be applied to fix the tree on the day of the git move.
* | Neutralize language specific to a repository type.Eric S. Raymond2014-10-251-1/+1
| |
* | Preparing for git transition; replace bzr-specific language.Eric S. Raymond2014-10-251-5/+5
| |
* | * admin/notes/versioning: Relocate and rewrite.Glenn Morris2014-10-151-0/+26
| |
* | Remove some admin/notes filesGlenn Morris2014-10-153-178/+0
| | | | | | | | | | | | | | | | * admin/notes/lel-TODO: Remove. This has not turned out to be a useful way to get things documented. * admin/notes/exit-value, admin/notes/iftc: Remove. These don't seem to have any particular relationship to Emacs development.
* | * admin/notes/bzr: Some bisect tips.Glenn Morris2014-09-031-0/+12
| |
* | Remove support for DJGPP < 2.02Reuben Thomas2014-08-091-7/+1
| | | | | | | | | | This also removes some specially-licensed files and lots of accompanying explanation.
* | Remove remaining mentions of VMS as a hostReuben Thomas2014-08-071-25/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * notes/exit-value: Remove specific discussion of VMS. * doc/emacs/programs.texi (Program Modes): Don't advertise VMS DCL support any more. * doc/misc/ediff.texi (Merging and diff3): Don't mention lack of support for VMS diff, we no longer support VMS. * lisp/progmodes/ada-mode.el: * lisp/net/tramp.el (tramp-handle-file-symlink-p): * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment about VMS, which we no longer support. * lisp/progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, and fix a FIXME, using convert-standard-filename in place of removed ada-convert-file-name. * lisp/url/url-handlers.el: Remove a comment about VMS, which we no longer support.
* | Merge from emacs-24; up to 2014-06-11T19:33:14Z!rgm@gnu.orgGlenn Morris2014-06-251-0/+33
|\ \ | |/
| * admin/notes/unicode: Some notes about what to do when a new Unicode version ↵Eli Zaretskii2014-06-241-0/+33
| | | | | | | | is imported.
* | Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.caGlenn Morris2014-06-211-2/+2
|\ \ | |/
| * * notes/elpa: Use "git" instead of "bzr" in the name of machine toStephen Berman2014-06-161-2/+2
| | | | | | | | clone the repository from.
* | Don't imply that `quoting' is required.Paul Eggert2014-05-291-2/+2
| |
* | * admin/notes/changelogs: Mention `quoting'.Glenn Morris2014-05-291-0/+9
| |