diff options
| author | Paul Eggert | 2012-01-14 22:41:53 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-01-14 22:41:53 -0800 |
| commit | 807f82fcebc7d946baa23f1d29ff5b0cf336f08e (patch) | |
| tree | fa41cebf5b9c6d3bb6a22517a7002fe3a398588f /admin | |
| parent | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (diff) | |
| parent | 861df977526140af8147bef4950e8863655c203d (diff) | |
| download | emacs-807f82fcebc7d946baa23f1d29ff5b0cf336f08e.tar.gz emacs-807f82fcebc7d946baa23f1d29ff5b0cf336f08e.zip | |
Merge from trunk.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/FOR-RELEASE | 6 | ||||
| -rw-r--r-- | admin/notes/multi-tty | 2 | ||||
| -rwxr-xr-x | admin/quick-install-emacs | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 3bfbab881aa..597beb60ce2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as | ||
| 4 | updated and checked. | ||
| 5 | |||
| 1 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 7 | ||
| 3 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): | 8 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): |
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index ad056ab0bda..0c75181aa03 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE | |||
| @@ -99,7 +99,7 @@ names of the people who have checked it. | |||
| 99 | 99 | ||
| 100 | SECTION READERS | 100 | SECTION READERS |
| 101 | ---------------------------------- | 101 | ---------------------------------- |
| 102 | TUTORIAL | 102 | TUTORIAL cyd |
| 103 | TUTORIAL.bg | 103 | TUTORIAL.bg |
| 104 | TUTORIAL.cn | 104 | TUTORIAL.cn |
| 105 | TUTORIAL.cs | 105 | TUTORIAL.cs |
| @@ -107,7 +107,7 @@ TUTORIAL.de | |||
| 107 | TUTORIAL.eo | 107 | TUTORIAL.eo |
| 108 | TUTORIAL.es | 108 | TUTORIAL.es |
| 109 | TUTORIAL.fr | 109 | TUTORIAL.fr |
| 110 | TUTORIAL.he | 110 | TUTORIAL.he eliz |
| 111 | TUTORIAL.it | 111 | TUTORIAL.it |
| 112 | TUTORIAL.ja | 112 | TUTORIAL.ja |
| 113 | TUTORIAL.ko | 113 | TUTORIAL.ko |
| @@ -133,7 +133,7 @@ buffers.texi cyd | |||
| 133 | building.texi cyd | 133 | building.texi cyd |
| 134 | calendar.texi | 134 | calendar.texi |
| 135 | cal-xtra.texi | 135 | cal-xtra.texi |
| 136 | cmdargs.texi | 136 | cmdargs.texi cyd |
| 137 | commands.texi cyd | 137 | commands.texi cyd |
| 138 | custom.texi cyd | 138 | custom.texi cyd |
| 139 | dired.texi cyd | 139 | dired.texi cyd |
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index ad46f493a02..4146c8ffa58 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty | |||
| @@ -789,7 +789,7 @@ DIARY OF CHANGES | |||
| 789 | frame's kboard from there.) | 789 | frame's kboard from there.) |
| 790 | 790 | ||
| 791 | -- Fix rif issue with X-tty combo sessions. IMHO the best thing to do | 791 | -- Fix rif issue with X-tty combo sessions. IMHO the best thing to do |
| 792 | is to get rid of that global variable (and use the value value in | 792 | is to get rid of that global variable (and use the value in |
| 793 | display_method, which is guaranteed to be correct). | 793 | display_method, which is guaranteed to be correct). |
| 794 | 794 | ||
| 795 | (Done, did exactly that. Core dumps during combo sessions became | 795 | (Done, did exactly that. Core dumps during combo sessions became |
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index 657dcdc1766..06cd2d40901 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs | |||
| @@ -49,7 +49,7 @@ COPY='cp -f' | |||
| 49 | REMOVE='rm -r' | 49 | REMOVE='rm -r' |
| 50 | MKDIR='mkdir -p' | 50 | MKDIR='mkdir -p' |
| 51 | 51 | ||
| 52 | # Used to execute commands once once we create them | 52 | # Used to execute commands once we create them |
| 53 | EXEC='sh' | 53 | EXEC='sh' |
| 54 | 54 | ||
| 55 | NAWK=/usr/bin/nawk | 55 | NAWK=/usr/bin/nawk |