Changeset 4169 for trunk/lisp/ses.el

Timestamp:

09/30/06 09:12:06 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp (modified) (1 prop)
• trunk/lisp/ses.el (modified) (16 diffs)

trunk/lisp/ses.el

@@ -238 +238 @@
-  "The initial contents of an empty spreadsheet.")
-
-(defconst ses-paramlines-plist
-  '(ses--col-widths  2 ses--col-printers  3 ses--default-printer  4
-    ses--header-row  5 ses--file-format   8 ses--numrows          9
-    ses--numcols    10)
-  "Offsets from last cell line to various parameter lines in the data area
-of a spreadsheet.")
-
-(defconst ses-box-prop '(:box (:line-width 2 :style released-button))
-  "Display properties to create a raised box for cells in the header line.")
@@ -256 +249 @@
-default printer and then modify its output.")
-
+
+;;----------------------------------------------------------------------------
+;; Local variables and constants
+;;----------------------------------------------------------------------------
+
-(eval-and-compile
-  (defconst ses-localvars
@@ -262 +260 @@
-      ses--deferred-recalc ses--deferred-write ses--file-format
-      ses--header-hscroll ses--header-row ses--header-string ses--linewidth
-
+
+
-      ;;Global variables that we override
-      mode-line-process next-line-add-newlines transient-mark-mode)
@@ -272 +271 @@
-    (make-local-variable x)
-    (set x nil)))
+
+(defconst ses-paramlines-plist
+  '(ses--col-widths  -5 ses--col-printers -4 ses--default-printer -3
+    ses--header-row  -2 ses--file-format   1 ses--numrows          2
+    ses--numcols      3)
+  "Offsets from 'Global parameters' line to various parameter lines in the
+data area of a spreadsheet.")
-
-
@@ -409 +415 @@
-cell in the range specified by CURCELL.  The range is available in the
-variables `minrow', `maxrow', `mincol', and `maxcol'."
+  (declare (indent defun) (debug (form body)))
-  (let ((cur (make-symbol "cur"))
-        (min (make-symbol "min"))
@@ -429 +436 @@
-             (setq col (+ ,c mincol))
-             ,@body))))))
-
-(put 'ses-dorange 'lisp-indent-function 'defun)
-(def-edebug-spec ses-dorange (form body))
-
-;;Support for coverage testing.
@@ -651 +655 @@
-  "Recalculate cells in LIST, checking for dependency loops.  Prints
-progress messages every second.  Dependent cells are not recalculated
-if
+and
-  (let ((ses--deferred-recalc list)
-        (nextlist             list)
@@ -710 +714 @@
-(defun ses-in-print-area ()
-  "Returns t if point is in print area of spreadsheet."
-eq (get-text-property (point) 'keymap) 'ses-mode-print-map
+<= (point) ses--data-marker
-
-;;We turn off point-motion-hooks and explicitly position the cursor, in case
@@ -954 +958 @@
-  (ses-widen)
-  (let ((inhibit-point-motion-hooks t)) ;In case intangible attrs are wrong
-    (goto-char (point-min))
-    (if col
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-(defun ses-set-parameter (def value &optional elem)
@@ -1071 +1077 @@
-  result-so-far)
-
+(defsubst ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
+  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
+COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
+by (ROWINCR,COLINCR)."
+  (let ((row (car rowcol))
+        (col (cdr rowcol)))
+    (if (or (< row startrow) (< col startcol))
+        sym
+      (setq row (+ row rowincr)
+            col (+ col colincr))
+      (if (and (>= row startrow) (>= col startcol)
+               (< row ses--numrows) (< col ses--numcols))
+          ;;Relocate this variable
+          (ses-create-cell-symbol row col)
+        ;;Delete reference to a deleted cell
+        nil))))
+
-(defun ses-relocate-formula (formula startrow startcol rowincr colincr)
-  "Produce a copy of FORMULA where all symbols that refer to cells in row
@@ -1114 +1137 @@
-                result))))
-      (nreverse result))))
-
-(defun ses-relocate-symbol (sym rowcol startrow startcol rowincr colincr)
-  "Relocate one symbol SYM, whichs corresponds to ROWCOL (a cons of ROW and
-COL).  Cells starting at (STARTROW,STARTCOL) are being shifted
-by (ROWINCR,COLINCR)."
-  (let ((row (car rowcol))
-        (col (cdr rowcol)))
-    (if (or (< row startrow) (< col startcol))
-        sym
-      (setq row (+ row rowincr)
-            col (+ col colincr))
-      (if (and (>= row startrow) (>= col startcol)
-               (< row ses--numrows) (< col ses--numcols))
-          ;;Relocate this variable
-          (ses-create-cell-symbol row col)
-        ;;Delete reference to a deleted cell
-        nil))))
-
-(defun ses-relocate-range (range startrow startcol rowincr colincr)
@@ -1338 +1344 @@
-  (search-backward ";; Local Variables:\n" nil t)
-  (backward-list 1)
+  (setq ses--params-marker (point-marker))
-  (let ((params (condition-case nil (read (current-buffer)) (error nil))))
-    (or (and (= (safe-length params) 3)
@@ -1367 +1374 @@
-  (or (looking-at ses-print-data-boundary)
-      (error "Missing marker between print and data areas"))
-
+
+
+
-  ;;Initialize printer and symbol lists
-  (mapc 'ses-printer-record ses-standard-printer-functions)
@@ -1574 +1583 @@
-          ;;read the local variables at the end of the file.  Now it's safe to
-          ;;do the narrowing.
-
-
-
-
+
-          (setq ses--deferred-narrow nil))
-        ;;Update the modeline
@@ -1804 +1810 @@
-      (insert ses--blank-line))
-    (insert ses-print-data-boundary)
+    (backward-char (1- (length ses-print-data-boundary)))
+    (setq ses--data-marker (point-marker))
+    (forward-char (1- (length ses-print-data-boundary)))
-    ;;Placeholders for cell data
-    (insert (make-string (* ses--numrows (1+ ses--numcols)) ?\n))
-    ;;Placeholders for col-widths, col-printers, default-printer, header-row
-    (insert "\n\n\n\n")
-
+
+
+
+
-  (ses-set-parameter 'ses--col-widths ses--col-widths)
-  (ses-set-parameter 'ses--col-printers ses--col-printers)
@@ -2881 +2893 @@
-
-;;All standard formulas are safe
-
+
+
-  (put x 'side-effect-free t))
-