[Emacs-diffs] Changes to emacs/lisp/textmodes/table.el

[Juanma Barranquero]

Index: emacs/lisp/textmodes/table.el
diff -c emacs/lisp/textmodes/table.el:1.16 emacs/lisp/textmodes/table.el:1.17
*** emacs/lisp/textmodes/table.el:1.16  Fri Jun 10 10:45:37 2005
--- emacs/lisp/textmodes/table.el       Mon Jul  4 03:41:55 2005
***************
*** 650,656 ****
    :version "22.1")
  
  (defgroup table-hooks nil
!   "Hooks for table manipulation utilities"
    :group 'table)
  
  (defcustom table-time-before-update 0.2
--- 650,656 ----
    :version "22.1")
  
  (defgroup table-hooks nil
!   "Hooks for table manipulation utilities."
    :group 'table)
  
  (defcustom table-time-before-update 0.2
***************
*** 1678,1684 ****
        (setq i 0)
        (while (< i columns)
        (let ((beg (point)))
!         (insert (make-string (car cw) ?\ ))
          (insert table-cell-vertical-char)
          (table--put-cell-line-property beg (1- (point))))
        (if (cdr cw) (setq cw (cdr cw)))
--- 1678,1684 ----
        (setq i 0)
        (while (< i columns)
        (let ((beg (point)))
!         (insert (make-string (car cw) ?\s))
          (insert table-cell-vertical-char)
          (table--put-cell-line-property beg (1- (point))))
        (if (cdr cw) (setq cw (cdr cw)))
***************
*** 2247,2253 ****
             (end (table--goto-coordinate (cons (cadr this) bottom-border-y)))
             (rect (extract-rectangle beg end))
             (height (+ (- (cddr this) (cdar this)) 1))
!            (blank-line (make-string (- (cadr this) (caar this)) ?\ )))
        ;; delete lines from the bottom of the cell
        (setcdr (nthcdr (- height bottom-budget 1) rect) (nthcdr height rect))
        ;; delete lines from the top of the cell
--- 2247,2253 ----
             (end (table--goto-coordinate (cons (cadr this) bottom-border-y)))
             (rect (extract-rectangle beg end))
             (height (+ (- (cddr this) (cdar this)) 1))
!            (blank-line (make-string (- (cadr this) (caar this)) ?\s)))
        ;; delete lines from the bottom of the cell
        (setcdr (nthcdr (- height bottom-budget 1) rect) (nthcdr height rect))
        ;; delete lines from the top of the cell
***************
*** 3363,3369 ****
                       ;; insert a column separator and column/multicolumn 
contents
                       (with-current-buffer dest-buffer
                         (unless first-p
!                          (insert (if (eq (char-before) ?\ ) "" " ") "& "))
                         (if (> span 1)
                             (insert (format "\\multicolumn{%d}{%sl|}{%s}" span 
(if first-p "|" "") line))
                           (insert line)))
--- 3363,3369 ----
                       ;; insert a column separator and column/multicolumn 
contents
                       (with-current-buffer dest-buffer
                         (unless first-p
!                          (insert (if (eq (char-before) ?\s) "" " ") "& "))
                         (if (> span 1)
                             (insert (format "\\multicolumn{%d}{%sl|}{%s}" span 
(if first-p "|" "") line))
                           (insert line)))
***************
*** 3379,3385 ****
              (setq i (1+ i)))
            (funcall insert-column start x1))
          (with-current-buffer dest-buffer
!           (insert (if (eq (char-before) ?\ ) "" " ") "\\\\\n"))))
        (setq y (1+ y)))
      (with-current-buffer dest-buffer
        (insert "\\hline\n"))
--- 3379,3385 ----
              (setq i (1+ i)))
            (funcall insert-column start x1))
          (with-current-buffer dest-buffer
!           (insert (if (eq (char-before) ?\s) "" " ") "\\\\\n"))))
        (setq y (1+ y)))
      (with-current-buffer dest-buffer
        (insert "\\hline\n"))
***************
*** 3534,3540 ****
      ;; insert the remaining area while appending blank lines below it
      (table--insert-rectangle
       (append rect (make-list (+ 2 (- (cdr rb-coord) (cdr lu-coord)))
!                            (make-string (+ 2 (- (car rb-coord) (car 
lu-coord))) ?\ ))))
      ;; remove the appended blank lines below the table if they are unnecessary
      (table--goto-coordinate (cons 0 (- (cdr bt-coord) (- (cdr rb-coord) (cdr 
lu-coord)))))
      (table--remove-blank-lines (+ 2 (- (cdr rb-coord) (cdr lu-coord))))
--- 3534,3540 ----
      ;; insert the remaining area while appending blank lines below it
      (table--insert-rectangle
       (append rect (make-list (+ 2 (- (cdr rb-coord) (cdr lu-coord)))
!                            (make-string (+ 2 (- (car rb-coord) (car 
lu-coord))) ?\s))))
      ;; remove the appended blank lines below the table if they are unnecessary
      (table--goto-coordinate (cons 0 (- (cdr bt-coord) (- (cdr rb-coord) (cdr 
lu-coord)))))
      (table--remove-blank-lines (+ 2 (- (cdr rb-coord) (cdr lu-coord))))
***************
*** 4014,4020 ****
                      (unless (eolp)
                        (delete-char 1)))
                  (delete-char -1)
!                 (insert ?\ )
                  (forward-char -1)))
              (setq n (1+ n)))
            (setq table-inhibit-auto-fill-paragraph t))
--- 4014,4020 ----
                      (unless (eolp)
                        (delete-char 1)))
                  (delete-char -1)
!                 (insert ?\s)
                  (forward-char -1)))
              (setq n (1+ n)))
            (setq table-inhibit-auto-fill-paragraph t))
***************
*** 4446,4461 ****
                     (move-to-column col)
                     (table--spacify-frame))))
            (delete-char 1)
!           (insert-before-markers ?\ ))
           ((table--cell-horizontal-char-p (char-after))
            (while (progn
                     (delete-char 1)
!                    (insert-before-markers ?\ )
                     (table--cell-horizontal-char-p (char-after)))))
           ((eq (char-after) table-cell-vertical-char)
            (while (let ((col (current-column)))
                     (delete-char 1)
!                    (insert-before-markers ?\ )
                     (and (zerop (forward-line 1))
                          (zerop (current-column))
                          (move-to-column col)
--- 4446,4461 ----
                     (move-to-column col)
                     (table--spacify-frame))))
            (delete-char 1)
!           (insert-before-markers ?\s))
           ((table--cell-horizontal-char-p (char-after))
            (while (progn
                     (delete-char 1)
!                    (insert-before-markers ?\s)
                     (table--cell-horizontal-char-p (char-after)))))
           ((eq (char-after) table-cell-vertical-char)
            (while (let ((col (current-column)))
                     (delete-char 1)
!                    (insert-before-markers ?\s)
                     (and (zerop (forward-line 1))
                          (zerop (current-column))
                          (move-to-column col)
***************
*** 4611,4617 ****
                (table--untabify-line)
                (delete-char columns-to-extend))
            (table--untabify-line (point))
!           (insert (make-string columns-to-extend ?\ )))
          (setcdr coord (1- (cdr coord)))))
        (table--goto-coordinate (caar (last top-to-bottom-coord-list)))
        (let ((coord (table--get-coordinate (cdr (table--horizontal-cell-list 
nil 'first-only 'bottom)))))
--- 4611,4617 ----
                (table--untabify-line)
                (delete-char columns-to-extend))
            (table--untabify-line (point))
!           (insert (make-string columns-to-extend ?\s)))
          (setcdr coord (1- (cdr coord)))))
        (table--goto-coordinate (caar (last top-to-bottom-coord-list)))
        (let ((coord (table--get-coordinate (cdr (table--horizontal-cell-list 
nil 'first-only 'bottom)))))
***************
*** 4625,4631 ****
                (table--untabify-line)
                (delete-char columns-to-extend))
            (table--untabify-line (point))
!           (insert (make-string columns-to-extend ?\ )))
          (setcdr coord (1+ (cdr coord)))))
        (while (<= (cdr beg-coord) (cdr end-coord))
        (table--untabify-line (table--goto-coordinate beg-coord 'no-extension))
--- 4625,4631 ----
                (table--untabify-line)
                (delete-char columns-to-extend))
            (table--untabify-line (point))
!           (insert (make-string columns-to-extend ?\s)))
          (setcdr coord (1+ (cdr coord)))))
        (while (<= (cdr beg-coord) (cdr end-coord))
        (table--untabify-line (table--goto-coordinate beg-coord 'no-extension))
***************
*** 4854,4860 ****
              (insert char)
              (unless (eolp)
                (delete-char 1))))
!       (if (not (eq char ?\ ))
            (if char (insert char))
          (if (not (looking-at "\\s *$"))
              (if (and table-fixed-width-mode
--- 4854,4860 ----
              (insert char)
              (unless (eolp)
                (delete-char 1))))
!       (if (not (eq char ?\s))
            (if char (insert char))
          (if (not (looking-at "\\s *$"))
              (if (and table-fixed-width-mode
***************
*** 5398,5404 ****
  
  (defun table--cell-blank-str (&optional n)
    "Return blank table cell string of length N."
!   (let ((str (make-string (or n 1) ?\ )))
      (table--put-cell-content-property 0 (length str) str)
      str))
  
--- 5398,5404 ----
  
  (defun table--cell-blank-str (&optional n)
    "Return blank table cell string of length N."
!   (let ((str (make-string (or n 1) ?\s)))
      (table--put-cell-content-property 0 (length str) str)
      str))
  
***************
*** 5481,5487 ****
             (and (zerop (forward-line 1))
                  (< (point) end)))
            (t (forward-char -1)
!              (insert-before-markers (if (equal (char-before) ?\ ) ?\  
table-word-continuation-char)
                                      "\n")
               t)))))
  
--- 5481,5487 ----
             (and (zerop (forward-line 1))
                  (< (point) end)))
            (t (forward-char -1)
!              (insert-before-markers (if (equal (char-before) ?\s) ?\s 
table-word-continuation-char)
                                      "\n")
               t)))))