summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:05:09 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-08-05 14:05:09 -0700
commitb76885f1dadf419fc9eb3f5f10ea5550b6e06a1a (patch)
tree459e59d1dbc928a8dd3e25656544a3e287a778aa /etc
parent92e5b41c7c5898820356fc66456804a45bbe7852 (diff)
parent26d4da070ff78df782c1734ade9109db0a541ffc (diff)
Merge from origin/emacs-25
26d4da0 New input method "probhat" for Bengali 4f445bf ; Spelling fix f403f03 ; Fix typo
Diffstat (limited to 'etc')
-rw-r--r--etc/AUTHORS2
-rw-r--r--etc/NEWS4
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/AUTHORS b/etc/AUTHORS
index dc5a28eac4..721f0d5be3 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -533,7 +533,7 @@ Brian Jenkins: changed frame.c frames.texi hooks.texi
Brian Marick: co-wrote hideif.el
-Brian Mckenna: changed eww.el
+Brian McKenna: changed eww.el
Brian Palmer: changed erc.el erc-list.el
diff --git a/etc/NEWS b/etc/NEWS
index fadf4c2af0..f845c1d776 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -808,7 +808,7 @@ random values; in particular, the Emacs server now uses this facility
to produce its authentication key.
---
-** New input methods: 'tamil-dvorak' and 'programmer-dvorak'.
+** New input methods: 'tamil-dvorak', 'programmer-dvorak' and 'probhat'.
* Editing Changes in Emacs 25.1
@@ -928,7 +928,7 @@ recommended to do this as soon as you have firmly upgraded to Emacs
to version 206, you can do this with 'C-u C-u M-x desktop-save'.
---
-*** desktop-restore-in-current-display now defaults to t, not nil.
+*** 'desktop-restore-in-current-display' now defaults to t, not nil.
That is, Emacs by default now restores frames into the current display.
+++