aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS7
-rw-r--r--etc/refcards/vipcard.tex2
3 files changed, 11 insertions, 2 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 62f00d05aca..6f419c346c6 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12014-02-25 Glenn Morris <rgm@gnu.org>
2
3 * refcards/vipcard.tex: Hook fix.
4
12014-02-23 Juanma Barranquero <lekktu@gmail.com> 52014-02-23 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * NEWS: Fix references to ?« and ?» that got mangled somehow. 7 * NEWS: Fix references to ?« and ?» that got mangled somehow.
diff --git a/etc/NEWS b/etc/NEWS
index f7a36c51fc2..5a3bf58976f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1202,7 +1202,12 @@ The function `display-popup-menus-p' will now return non-nil for a
1202display or frame whenever a mouse is supported on that display or 1202display or frame whenever a mouse is supported on that display or
1203frame. 1203frame.
1204 1204
1205*** New hook `tty-setup-hook'. 1205+++
1206*** New hook `tty-setup-hook', run at the end of initializing a text terminal.
1207
1208+++
1209*** The hook `term-setup-hook' is obsolete. It is entirely equivalent
1210to `emacs-startup-hook'. See also the new `tty-setup-hook'.
1206 1211
1207** Window Handling 1212** Window Handling
1208 1213
diff --git a/etc/refcards/vipcard.tex b/etc/refcards/vipcard.tex
index deb42a7f34f..23f263202a7 100644
--- a/etc/refcards/vipcard.tex
+++ b/etc/refcards/vipcard.tex
@@ -279,7 +279,7 @@ If you wish to be in vi mode just after you startup Emacs,
279include the line: 279include the line:
280 280
281\hskip 5ex 281\hskip 5ex
282\kbd{(setq term-setup-hook 'vip-mode)} 282\kbd{(add-hook 'emacs-startup-hook 'vip-mode)}
283 283
284in your \kbd{.emacs} file. 284in your \kbd{.emacs} file.
285Or, you can put the following alias in your \kbd{.cshrc} file. 285Or, you can put the following alias in your \kbd{.cshrc} file.