diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:29:22 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:29:22 -0800 |
| commit | f15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c (patch) | |
| tree | 7068ac99c5729e94a93a4a0ae7ddd1acbb7d2c01 /admin | |
| parent | 118a31a3b1eb08cba14887c3134054e9b4383688 (diff) | |
| parent | ec26c23f4815fbc6bbd16d20f400721bc7b58344 (diff) | |
| download | emacs-f15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c.tar.gz | |
Merge from origin/emacs-24
ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"
Conflicts:
lisp/ChangeLog
src/ChangeLog
src/xdisp.c
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el index afab6f0e1e8..d214ff281b7 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -357,6 +357,7 @@ Changes to files matching one of the regexps in this list are not listed.") "All" "Version" "Everywhere" "Many" "Various" "files" ;; Directories. "vms" "mac" "url" "tree-widget" + "info/dir" ) "List of files and directories to ignore. Changes to files in this list are not listed.") @@ -796,6 +797,7 @@ in the repository.") ("play/bruce.el" . "bruce.el") ("play/yow.el" . "yow.el") ("patcomp.el" . "patcomp.el") + ("emulation/ws-mode.el" . "ws-mode.el") ;; From lisp to etc/forms. ("forms-d2.el" . "forms-d2.el") ("forms-pass.el" . "forms-pass.el") |