diff options
| author | Paul Eggert | 2016-04-24 12:48:34 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-24 12:48:34 -0700 |
| commit | f7794460e8e9e0c514b0cb01dd010b531c21169c (patch) | |
| tree | 4bc195ab38f3e0e106b21b02d080be558ba80b33 /doc/misc | |
| parent | e6d6a99455183bca5074b7601ad11d424da6442e (diff) | |
| parent | 78f9af707f711121ba24d8dce88d6757683a4dfe (diff) | |
| download | emacs-f7794460e8e9e0c514b0cb01dd010b531c21169c.tar.gz emacs-f7794460e8e9e0c514b0cb01dd010b531c21169c.zip | |
Merge from origin/emacs-25
78f9af7 ; ChangeLog fixes
162e549 * admin/authors.el (authors-ignored-files): Additions.
2b31a0c In x_set_window_size restore do_pending_window_change calls
401857e Fix Alt-modified keys on some European MS-Windows keyboards
a77cf24 Document 'help-go-forward'
1ba947f Revert "Allow to customize names of executables used by grep.el"
570e0fa Revert "Don't use 'find-program'"
645f4ef Revert "Use 'grep-find-program' in check-declare.el"
aa03257 Clarify documentation of 'dired-mark-files-containing-regexp'
ce0d8c7 Make tmm-menubar work in correct order again
b8d5a8f Remove the Meta-CVS VC backend
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/efaq-w32.texi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi index fe65da6d612..28c09f69744 100644 --- a/doc/misc/efaq-w32.texi +++ b/doc/misc/efaq-w32.texi | |||
| @@ -2061,7 +2061,6 @@ Jonathan Arnold has written an | |||
| 2061 | @cindex mercurial, version control integration with Emacs | 2061 | @cindex mercurial, version control integration with Emacs |
| 2062 | @cindex hg, version control integration with Emacs | 2062 | @cindex hg, version control integration with Emacs |
| 2063 | @cindex monotone, version control integration with Emacs | 2063 | @cindex monotone, version control integration with Emacs |
| 2064 | @cindex mcvs, version control integration with Emacs | ||
| 2065 | 2064 | ||
| 2066 | If you are using a graphical revision control tool already, check if | 2065 | If you are using a graphical revision control tool already, check if |
| 2067 | it comes with command-line tools. Many such GUI tools are just | 2066 | it comes with command-line tools. Many such GUI tools are just |