Merge Org 7.8.03

[gnu-emacs] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index e5bd7fa9d27bcb29d5d489a83234d8b00f6fb2ad..fb6090b3583cfb8adc8aee08d36afd4c2ec687fb 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -1491,9 +1491,9 @@
 
 1996-04-16  Francesco Potortì  <F.Potorti@cnuce.cnr.it>
 
-       * vc.el (vc-comment-ring): Initialise using make-ring.
-       (vc-clear-context): Initialise vc-comment-ring using make-ring.
-       (vc-finish-logentry): Don't initialise vc-comment-ring here.
+       * vc.el (vc-comment-ring): Initialize using make-ring.
+       (vc-clear-context): Initialize vc-comment-ring using make-ring.
+       (vc-finish-logentry): Don't initialize vc-comment-ring here.
 
 1996-04-15  Eric Ding  <ericding@mit.edu>
 
@@ -3055,7 +3055,7 @@
        (font-lock-mode): Use them.  Doc fix.
        Don't make font-lock-fontified buffer local here.
        (font-lock-set-defaults): Do it here.
-       (font-lock-compile-keyword): New function.  Recognise `eval' keywords.
+       (font-lock-compile-keyword): New function.  Recognize `eval' keywords.
        (font-lock-compile-keywords): Use it.
        (global-font-lock-mode): New command for Global Font Lock mode.
        (font-lock-global-modes): New variable.
@@ -5716,7 +5716,7 @@
        (vip-read-string-with-history, vip-search): Won't pause inside
        macros any more.
        * viper-mous.el (vip-surrounding-word): Modified to understand
-       tripple clicks.
+       triple clicks.
        * viper-util.el (vip-leave-region-active): New function.
        * viper-ex.el (ex-write): Uses better defaults.
        * viper-macs.el (vip-record-kbd-macro): Correctly escapes `.' and
@@ -6689,7 +6689,7 @@
        Harnessed view-minor-mode.
        Added (vip-leave-region-active) to all simple movement commands.
        * viper-mous.el (vip-surrounding-word): Modified to understand
-       tripple clicks.
+       triple clicks.
        * viper-util.el (vip-leave-region-active): New function.
 
 1995-08-19  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -6892,7 +6892,7 @@
        (find-file-noselect): Use it if new optional argument `rawfile' is
        non-nil.
 
-       * startup.el (command-line-1): Add option --eval to evalute an
+       * startup.el (command-line-1): Add option --eval to evaluate an
        expression on the command line and print the result.
 
 1995-08-14  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
@@ -8022,8 +8022,7 @@ See ChangeLog.5 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+    Copyright (C) 1995-1996, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -8039,5 +8038,3 @@ See ChangeLog.5 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: f90e8ffe-6bd0-4423-97d9-637ac4382520