Merge from origin/emacs-24

[gnu-emacs] / lisp / textmodes / table.el

diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 4d8a74323c7a083ec4d1df0999c79b0f8168d621..5059300a5c17d66275c4a5464bd833b477dced9f 100644 (file)
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -1,6 +1,6 @@
 ;;; table.el --- create and edit WYSIWYG text based embedded tables  -*- lexical-binding: t -*-
 
-;; Copyright (C) 2000-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
@@ -559,7 +559,7 @@
 ;; Todo: (in the order of priority, some are just possibility)
 ;; -----
 ;;
-;; Fix compatibilities with other input method than quail
+;; Fix incompatibilities with input methods other than quail
 ;; Resolve conflict with flyspell
 ;; Use mouse for resizing cells
 ;; A mechanism to link cells internally