diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/textmodes/table.el | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'lisp/textmodes/table.el')
| -rw-r--r-- | lisp/textmodes/table.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 70bd3a07a9f..c0a85eeb68c 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -1,12 +1,12 @@ ;;; table.el --- create and edit WYSIWYG text based embedded tables ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2007 Free Software Foundation, Inc. ;; Keywords: wp, convenience ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com> ;; Created: Sat Jul 08 2000 13:28:45 (PST) -;; Revised: Thu Jul 20 2006 17:30:09 (PDT) +;; Revised: Wed Jan 03 2007 13:23:46 (PST) ;; This file is part of GNU Emacs. @@ -5358,7 +5358,7 @@ is non-nil. The warning is done only once per session for each item." (cond ((and (featurep 'xemacs) (not (get 'table-disable-incompatibility-warning 'xemacs))) (put 'table-disable-incompatibility-warning 'xemacs t) - (momentary-string-display + (display-warning 'table " *** Warning *** @@ -5369,12 +5369,12 @@ such that a border characters dissolve into adjacent cells. Please be aware of this. " - (save-excursion (forward-line 1) (point)))) + :warning)) ((and (boundp 'flyspell-mode) flyspell-mode (not (get 'table-disable-incompatibility-warning 'flyspell))) (put 'table-disable-incompatibility-warning 'flyspell t) - (momentary-string-display + (display-warning 'table " *** Warning *** @@ -5383,7 +5383,7 @@ package. The flyspell version 1.5d at http://kaolin.unice.fr/~serrano works better than the previous versions however not fully compatible. " - (save-excursion (forward-line 1) (point)))) + :warning)) ))) (defun table--cell-blank-str (&optional n) |