Merge from trunk.

[gnu-emacs] / lisp / ChangeLog.3

diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index b26a048ac56d0b06dc4be440410559c5a963df7f..8cafac2c0c4df922703a50f26dd263c25006847b 100644 (file)
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -172,7 +172,7 @@
        Choose string< or < as predicate.
        Reorder messages by exchanging them, with inhibit-quit bound.
        (rmail-fetch-field): Start by widening.
-       (rmail-sortable-date-strng): Deleted.
+       (rmail-sortable-date-string): Deleted.
        (rmail-make-date-sortable): New function, used instead.
 
        * paths.el (gnus-local-organization): Renamed from ...-your-...
@@ -2619,7 +2619,7 @@
 
        * frame.el (frame-initialize): Fix error syntax.
        (toggle-horizontal-scroll-bar): Likewise.
-       (toggle-horizontal-scroll-bar): Renamed from set-horizontal-bar
+       (toggle-horizontal-scroll-bar): Renamed from set-horizontal-bar.
        (toggle-vertical-scroll-bar): Likewise.
        (toggle-auto-lower, toggle-auto-raise): Likewise.
        (set-foreground-color, set-background-color):
@@ -10344,7 +10344,7 @@
        (list-diary-entries, mark-diary-entries)
        (include-other-diary-files, mark-included-diary-files):
        Added the possibility of `shared diary files' with a recursive
-       include mechanism like the C preprocessor
+       include mechanism like the C preprocessor.
        (list-calendar-holidays): Eliminated the 'special class of holidays,
        rewriting the entire mechanism to make it more general.
        (calendar-holiday-function-float): Changed the 'float class of
@@ -12091,7 +12091,7 @@
 
 1988-12-12  Richard Stallman  (rms@mole.ai.mit.edu)
 
-       * telnet.el (telnet-send-input): Save input in telnet-previous-input
+       * telnet.el (telnet-send-input): Save input in telnet-previous-input.
        (telnet-mode): Make that var buffer-local.
        (telnet-copy-last-input): New fn to yank that var; now on C-c C-y.
 
@@ -12438,8 +12438,7 @@ See ChangeLog.2 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, 2005, 2006,
-    2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+    Copyright (C) 1989, 1993, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -12456,4 +12455,3 @@ See ChangeLog.2 for earlier changes.
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; arch-tag: f07a3446-5672-464a-8fdc-2ca92e8e7b2a