aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert2011-06-10 11:19:35 -0700
committerPaul Eggert2011-06-10 11:19:35 -0700
commite41e9a0e24877b0bc81e08df396f59115f8636da (patch)
treec0cf7e2838761b2c26047aeeac6415bb542bf5a0 /etc
parent6a54b501af0633c909c96de867c805222fde970c (diff)
parent529a133c390049085db38e7c8f745d650a2626ee (diff)
downloademacs-e41e9a0e24877b0bc81e08df396f59115f8636da.tar.gz
emacs-e41e9a0e24877b0bc81e08df396f59115f8636da.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/NEWS b/etc/NEWS
index eaa6ee1b704..51b179d8ddc 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -294,7 +294,7 @@ the remote file-name cache is used for read access.
294 294
295+++ 295+++
296** The use of a "mode: minor" specification in a file local variables section 296** The use of a "mode: minor" specification in a file local variables section
297to enable a minor-mode is deprecated. Instead, use "eval: (minor-mode)". 297to enable a minor-mode is deprecated. Instead, use "eval: (minor-mode 1)".
298 298
299** The standalone programs lib-src/digest-doc and sorted-doc have been 299** The standalone programs lib-src/digest-doc and sorted-doc have been
300replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'. 300replaced with Lisp commands `doc-file-to-man' and `doc-file-to-info'.