diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-03-18 23:17:34 +0000 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2005-03-18 23:17:34 +0000 |
commit | 951f97e67d904729032b476caf5f7c2e7e303d73 (patch) | |
tree | 331bc0a56362f7e34790bdf72ccb3a45154fe58f /lisp/textmodes/table.el | |
parent | 9188be47894513f5bb58b58ed619d9f5de14ec38 (diff) | |
download | emacs-951f97e67d904729032b476caf5f7c2e7e303d73.tar.gz |
(table--line-column-position): New idiom.
(table--row-column-insertion-point-p): New function to test
validity of row and column insertion operation at a location.
(table-global-menu, table-cell-menu): Use above functions for
deterministic test operation.
(table--editable-cell-p): Behave in deterministic fashion.
Diffstat (limited to 'lisp/textmodes/table.el')
-rw-r--r-- | lisp/textmodes/table.el | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 2c685753f1f..52a0c8a1deb 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -1,11 +1,12 @@ ;;; table.el --- create and edit WYSIWYG text based embedded tables -;; Copyright (C) 2000, 01, 02, 03, 04 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +;; 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: Tue Jun 01 2004 11:36:39 (PDT) +;; Revised: Fri Mar 18 2005 13:50:13 (PST) ;; This file is part of GNU Emacs. @@ -1024,16 +1025,10 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu :active (and (not buffer-read-only) (not (table--probe-cell))) :help "Insert a text based table at point"] ["Row" table-insert-row - :active (and (not buffer-read-only) - (or (table--probe-cell) - (save-excursion - (table--find-row-column nil t)))) + :active (table--row-column-insertion-point-p) :help "Insert row(s) of cells in table"] ["Column" table-insert-column - :active (and (not buffer-read-only) - (or (table--probe-cell) - (save-excursion - (table--find-row-column 'column t)))) + :active (table--row-column-insertion-point-p 'column) :help "Insert column(s) of cells in table"]) "----" ("Recognize" @@ -1076,16 +1071,10 @@ This is always set to nil at the entry to `table-with-cache-buffer' before execu '("Table" ("Insert" ["Row" table-insert-row - :active (and (not buffer-read-only) - (or (table--probe-cell) - (save-excursion - (table--find-row-column nil t)))) + :active (table--row-column-insertion-point-p) :help "Insert row(s) of cells in table"] ["Column" table-insert-column - :active (and (not buffer-read-only) - (or (table--probe-cell) - (save-excursion - (table--find-row-column 'column t)))) + :active (table--row-column-insertion-point-p 'column) :help "Insert column(s) of cells in table"]) ("Delete" ["Row" table-delete-row @@ -4698,6 +4687,30 @@ of line." (setq multiplier (1- multiplier))) ret-str)) +(defun table--line-column-position (line column) + "Return the location of LINE forward at COLUMN." + (save-excursion + (forward-line line) + (move-to-column column) + (point))) + +(defun table--row-column-insertion-point-p (&optional columnp) + "Return non nil if it makes sense to insert a row or a column at point." + (and (not buffer-read-only) + (or (get-text-property (point) 'table-cell) + (let ((column (current-column))) + (if columnp + (or (text-property-any (line-beginning-position 0) + (table--line-column-position -1 column) + 'table-cell t) + (text-property-any (line-beginning-position) (point) 'table-cell t) + (text-property-any (line-beginning-position 2) + (table--line-column-position 1 column) + 'table-cell t)) + (text-property-any (table--line-column-position -2 column) + (table--line-column-position -2 (+ 2 column)) + 'table-cell t)))))) + (defun table--find-row-column (&optional columnp no-error) "Search table and return a cell coordinate list of row or column." (let ((current-coordinate (table--get-coordinate))) @@ -5136,7 +5149,7 @@ Focus only on the corner pattern. Further cell validity check is required." (defun table--editable-cell-p (&optional abort-on-error) (and (not buffer-read-only) - (table--probe-cell abort-on-error))) + (get-text-property (point) 'table-cell))) (defun table--probe-cell (&optional abort-on-error) "Probes a table cell around the point. @@ -5603,5 +5616,5 @@ It returns COLUMN unless STR contains some wide characters." ;; End: *** ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0 +;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0 ;;; table.el ends here |