Changeset 4091 for trunk/lisp/ses.el

Timestamp:

05/27/06 10:35:24 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/ses.el (modified) (14 diffs)

trunk/lisp/ses.el

@@ -400 +400 @@
-  "Load the header row from the spreadsheet file and checks it
-for safety.  This is a macro to prevent propagate-on-load viruses."
-< row ses--numrows
+or (zerop ses--numrows) (< row ses--numrows)
-      (error "Bad header-row"))
-  (setq ses--header-row row)
@@ -941 +941 @@
-(defun ses-narrowed-p () (/= (- (point-max) (point-min)) (buffer-size)))
-
+(defun ses-widen ()
+  "Turn off narrowing, to be reenabled at end of command loop."
+  (if (ses-narrowed-p)
+      (setq ses--deferred-narrow t))
+  (widen))
+
-(defun ses-goto-data (def &optional col)
-  "Move point to data area for (DEF,COL).  If DEF is a row
@@ -946 +952 @@
-is one of the symbols ses--col-widths, ses--col-printers,
-ses--default-printer, ses--numrows, or ses--numcols."
-
-
-
+
-  (let ((inhibit-point-motion-hooks t)) ;In case intangible attrs are wrong
-    (goto-char (point-min))
@@ -967 +971 @@
-    ;;numcols in case one of them is being changed.
-    (ses-goto-data def)
-    (if elem
-        (ses-aset-with-undo (symbol-value def) elem value)
-      (ses-set-with-undo def value))
-    (let ((inhibit-read-only t)
-          (fmt (plist-get '(ses--col-widths      "(ses-column-widths %S)"
@@ -978 +979 @@
-                            ses--numrows         " %S ;numrows"
-                            ses--numcols         " %S ;numcols")
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-(defun ses-write-cells ()
@@ -1279 +1291 @@
-;;----------------------------------------------------------------------------
-
-;; This should be unnecessary, because the feature is now built in.
-
-(defadvice undo-more (around ses-undo-more activate preactivate)
-  "For SES mode, allow undo outside of narrowed buffer range."
-  (if (not (eq major-mode 'ses-mode))
-      ad-do-it
-    ;;Here is some extra code for SES mode.
-    (setq ses--deferred-narrow
-          (or ses--deferred-narrow (ses-narrowed-p)))
-    (widen)
-    (condition-case x
-        ad-do-it
-      (error
-       ;;Restore narrow if appropriate
-       (ses-command-hook)
-       (signal (car x) (cdr x))))))
-
-(defun ses-begin-change ()
-  "For undo, remember point before we start changing hidden stuff."
@@ -1304 +1299 @@
-(defun ses-set-with-undo (sym newval)
-  "Like set, but undoable.  Result is t if value has changed."
-
+try to 
-  ;;unavoidable for strings because equal ignores text properties and there's
-  ;;no easy way to get the whole property list to see if it's different!
@@ -1347 +1342 @@
-             (numberp (car params))
-             (numberp (cadr params))
-
+=
-             (numberp (nth 2 params))
-             (> (nth 2 params) 0))
@@ -1569 +1564 @@
-            (setq ses--deferred-recalc nil)
-            (ses-update-cells old)))
-
-
-
-
-
+
+
+
+
+
+
-        (when ses--deferred-narrow
-          ;;We're not allowed to narrow the buffer until after-find-file has
@@ -1795 +1791 @@
-                              (ses-cell-references yrow ycol)))))))
-  ;;Delete everything and reconstruct basic data area
-
-
-
+
-  (let ((inhibit-read-only t))
-    (goto-char (point-max))
@@ -1878 +1872 @@
-            t                         ;Convert to Lisp object
-            'ses-read-cell-history
-
+
+
+
-  (when (ses-edit-cell row col newval)
-    (ses-command-hook) ;Update cell widths before movement
@@ -2074 +2070 @@
-  ;;Reconstruct text attributes
-  (ses-setup)
+  ;;Prepare for undo
+  (push '(apply ses-widen) buffer-undo-list)
-  ;;Return to current cell
-  (if ses--curcell
@@ -2110 +2108 @@
-  ;;Reconstruct attributes
-  (ses-setup)
+  ;;Prepare for undo
+  (push '(apply ses-widen) buffer-undo-list)
-  (ses-jump-safe ses--curcell))
-
@@ -2644 +2644 @@
-      (error "Invalid header-row"))
-  (ses-begin-change)
-
+
+
+
+
-  (ses-reset-header-string))
-