[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110966: * lisp/textmodes/table.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110966: * lisp/textmodes/table.el (table-insert): Don't use `symbol-name' on |
Date: |
Mon, 26 Nov 2012 21:06:19 -0500 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110966
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13005
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-26 21:06:19 -0500
message:
* lisp/textmodes/table.el (table-insert): Don't use `symbol-name' on
lexically scoped variables.
modified:
lisp/ChangeLog
lisp/textmodes/table.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-11-26 23:50:12 +0000
+++ b/lisp/ChangeLog 2012-11-27 02:06:19 +0000
@@ -1,3 +1,8 @@
+2012-11-27 Stefan Monnier <address@hidden>
+
+ * textmodes/table.el (table-insert): Don't use `symbol-name' on
+ lexically scoped variables (bug#13005).
+
2012-11-26 Glenn Morris <address@hidden>
* vc/vc-hooks.el (vc-mistrust-permissions):
@@ -27,8 +32,8 @@
2012-11-25 Eli Zaretskii <address@hidden>
- * descr-text.el (describe-char-padded-string): Call
- internal-char-font only on GUI frames. (Bug#11964)
+ * descr-text.el (describe-char-padded-string):
+ Call internal-char-font only on GUI frames. (Bug#11964)
2012-11-24 Andreas Schwab <address@hidden>
=== modified file 'lisp/textmodes/table.el'
--- a/lisp/textmodes/table.el 2012-10-02 03:46:08 +0000
+++ b/lisp/textmodes/table.el 2012-11-27 02:06:19 +0000
@@ -1570,8 +1570,7 @@
Inside a table cell has a special keymap.
-\\{table-cell-map}
-"
+\\{table-cell-map}"
(interactive
(progn
(barf-if-buffer-read-only)
@@ -1583,41 +1582,47 @@
("Cell width(s)" . table-cell-width-history)
("Cell height(s)" . table-cell-height-history)))))
(table--make-cell-map)
- ;; reform the arguments.
+ ;; Reform the arguments.
(if (null cell-width) (setq cell-width (car table-cell-width-history)))
(if (null cell-height) (setq cell-height (car table-cell-height-history)))
(if (stringp columns) (setq columns (string-to-number columns)))
(if (stringp rows) (setq rows (string-to-number rows)))
- (if (stringp cell-width) (setq cell-width (table--string-to-number-list
cell-width)))
- (if (stringp cell-height) (setq cell-height (table--string-to-number-list
cell-height)))
+ (if (stringp cell-width)
+ (setq cell-width (table--string-to-number-list cell-width)))
+ (if (stringp cell-height)
+ (setq cell-height (table--string-to-number-list cell-height)))
(if (numberp cell-width) (setq cell-width (cons cell-width nil)))
(if (numberp cell-height) (setq cell-height (cons cell-height nil)))
- ;; test validity of the arguments.
- (mapc (lambda (arg)
- (let* ((value (symbol-value arg))
- (error-handler
- (function (lambda ()
- (error "%s must be a positive integer%s" arg
- (if (listp value) " or a list of positive integers"
""))))))
- (if (null value) (funcall error-handler))
- (mapcar (function (lambda (arg1)
- (if (or (not (integerp arg1))
- (< arg1 1))
- (funcall error-handler))))
- (if (listp value) value
- (cons value nil)))))
- '(columns rows cell-width cell-height))
+ ;; Test validity of the arguments.
+ (dolist (arg `((columns . ,columns)
+ (rows . ,rows)
+ (cell-width . ,cell-width)
+ (cell-height . ,cell-height)))
+ (let* ((value (cdr arg))
+ (error-handler
+ (lambda ()
+ (error "%s must be a positive integer%s" (car arg)
+ (if (listp value)
+ " or a list of positive integers" "")))))
+ (if (null value) (funcall error-handler))
+ (dolist (arg1 (if (listp value) value
+ (cons value nil)))
+ (if (or (not (integerp arg1))
+ (< arg1 1))
+ (funcall error-handler)))))
(let ((orig-coord (table--get-coordinate))
(coord (table--get-coordinate))
r i cw ch cell-str border-str)
- ;; prefabricate the building blocks border-str and cell-str.
+ ;; Prefabricate the building blocks border-str and cell-str.
(with-temp-buffer
- ;; construct border-str
+ ;; Construct border-str.
(insert table-cell-intersection-char)
(setq cw cell-width)
(setq i 0)
(while (< i columns)
- (insert (make-string (car cw) (string-to-char
table-cell-horizontal-chars)) table-cell-intersection-char)
+ (insert (make-string (car cw)
+ (string-to-char table-cell-horizontal-chars))
+ table-cell-intersection-char)
(if (cdr cw) (setq cw (cdr cw)))
(setq i (1+ i)))
(setq border-str (buffer-substring (point-min) (point-max)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r110966: * lisp/textmodes/table.el (table-insert): Don't use `symbol-name' on,
Stefan Monnier <=