From 4e454e5bed3bffcbf38ac291b092c346a6b177cf Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 26 Sep 2007 00:36:39 +0000 Subject: [PATCH] (table--generate-source-epilogue, table-insert, table--generate-source-cells-in-a-row, table--make-cell-map, *table--cell-describe-bindings): Use `mapc' rather than `mapcar'. --- lisp/ChangeLog | 65 +++++++++++++++++++++++++++++++- lisp/textmodes/table.el | 82 ++++++++++++++++++++--------------------- 2 files changed, 105 insertions(+), 42 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d694708e0d..c621d257a44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,66 @@ +2007-09-26 Juanma Barranquero + + * calc/calc-ext.el (calc-init-extensions, calc-reset): + * calc/calc-help.el (calc-full-help): + * calc/calc-misc.el (another-calc): + * calc/calc-store.el (calc-var-name-map): + * calc/calc-stuff.el (calc-flush-caches): + * calc/calc-units.el (math-build-units-table): + * calc/calc.el (calc-digit-map, calc-dispatch-map, calc-mode) + (calc-quit): + * calendar/icalendar.el (icalendar--format-ical-event) + (icalendar--convert-ical-to-diary): + * emacs-lisp/authors.el (authors): + * emacs-lisp/cust-print.el (custom-print-install) + (custom-print-uninstall): + * emacs-lisp/disass.el (disassemble-1): + * emacs-lisp/easy-mmode.el (easy-mmode-define-syntax): + * emacs-lisp/edebug.el (byte-compile-resolve-functions): + * emacs-lisp/elint.el (elint-current-buffer, elint-check-defun-form) + (elint-check-let-form, elint-check-condition-case-form) + (elint-initialize): + * emacs-lisp/elp.el (elp-results): + * emacs-lisp/generic.el (generic-mode-internal): + * emacs-lisp/re-builder.el (reb-delete-overlays): + * emacs-lisp/regi.el (regi-interpret): + * emacs-lisp/sregex.el (sregex--char-aux): + * emulation/cua-rect.el (cua--deactivate-rectangle) + (cua--highlight-rectangle, cua--rectangle-post-command): + * emulation/viper-keym.el (viper-toggle-key, viper-ESC-key): + * emulation/viper-macs.el (viper-describe-kbd-macros) + (viper-describe-one-macro): + * emulation/viper-util.el (viper-setup-master-buffer): + * emulation/viper.el (set-viper-state-in-major-mode): + * international/mule-diag.el (describe-current-coding-system): + * language/ethio-util.el (ethio-fidel-to-sera-buffer): + * mail/emacsbug.el (report-emacs-bug): + * net/ange-ftp.el (ange-ftp-call-chmod, ange-ftp-parse-bs2000-listing): + * obsolete/hilit19.el (hilit-unhighlight-region) + (hilit-set-mode-patterns): + * play/solitaire.el (solitaire-check, solitaire-solve): + * play/zone.el (zone-pgm-rotate): + * progmodes/ada-mode.el (ada-save-exceptions-to-file): + * progmodes/ada-prj.el (ada-prj-display-page): + * progmodes/delphi.el (delphi-search-directory, delphi-find-unit-file) + (delphi-debug-mode-map, delphi-mode-map, delphi-mode): + * progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-view-exit-fn) + (ebrowse-member-mode, ebrowse-save-tree-as, ebrowse-save-class): + * progmodes/sh-script.el (sh-make-vars-local) + (sh-reset-indent-vars-to-global-values): + * progmodes/sql.el (top): + * progmodes/vhdl-mode.el (vhdl-set-style, vhdl-regress-line): + * progmodes/xscheme.el (top): + * textmodes/artist.el (artist-mt-get-symbol-from-keyword-sub) + (artist-go-retrieve-from-symbol-sub, artist-go-get-symbol-shift-sub) + (artist-fc-retrieve-from-symbol-sub, artist-vaporize-line) + (artist-vaporize-lines, artist-ellipse-compute-fill-info) + (artist-submit-bug-report): + * textmodes/flyspell.el (flyspell-delay-commands) + (flyspell-deplacement-commands): + * textmodes/table.el (table--generate-source-epilogue, table-insert) + (table--generate-source-cells-in-a-row, table--make-cell-map) + (*table--cell-describe-bindings): Use `mapc' rather than `mapcar'. + 2007-09-25 Juanma Barranquero * allout.el (produce-allout-mode-map, allout-process-exposed): @@ -71,7 +134,7 @@ 2007-09-24 Adam Hupp - * progmodes/python.el (run-python): Import Emacs module without + * progmodes/python.el (run-python): Import emacs module without waiting; prevents lockup on error. 2007-09-23 Richard Stallman diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index eadb9e606c3..5e8b8c7cbc2 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -1376,7 +1376,7 @@ the last cache point coordinate." ;; ;; Point Motion Only Group -(mapcar +(mapc (lambda (command) (let ((func-symbol (intern (format "*table--cell-%s" command))) (doc-string (format "Table remapped function for `%s'." command))) @@ -1409,7 +1409,7 @@ the last cache point coordinate." backward-paragraph)) ;; Extraction Group -(mapcar +(mapc (lambda (command) (let ((func-symbol (intern (format "*table--cell-%s" command))) (doc-string (format "Table remapped function for `%s'." command))) @@ -1443,7 +1443,7 @@ the last cache point coordinate." backward-kill-sexp)) ;; Pasting Group -(mapcar +(mapc (lambda (command) (let ((func-symbol (intern (format "*table--cell-%s" command))) (doc-string (format "Table remapped function for `%s'." command))) @@ -1469,7 +1469,7 @@ the last cache point coordinate." insert)) ;; Formatting Group -(mapcar +(mapc (lambda (command) (let ((func-symbol (intern (format "*table--cell-%s" command))) (doc-string (format "Table remapped function for `%s'." command))) @@ -1641,20 +1641,20 @@ Inside a table cell has a special keymap. (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. - (mapcar (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)) + (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)) (let ((orig-coord (table--get-coordinate)) (coord (table--get-coordinate)) r i cw ch cell-str border-str) @@ -3141,7 +3141,7 @@ CALS (DocBook DTD): (set-marker-insertion-type (table-get-source-info 'colspec-marker) t) ;; insert before (save-excursion (goto-char (table-get-source-info 'colspec-marker)) - (mapcar + (mapc (lambda (col) (insert (format " \n" col col))) (sort (table-get-source-info 'colnum-list) '<))) @@ -3223,11 +3223,11 @@ CALS (DocBook DTD): (if (> colspan 1) (let ((scol (table-get-source-info 'current-column)) (ecol (+ (table-get-source-info 'current-column) colspan -1))) - (mapcar (lambda (col) - (unless (memq col (table-get-source-info 'colnum-list)) - (table-put-source-info 'colnum-list - (cons col (table-get-source-info 'colnum-list))))) - (list scol ecol)) + (mapc (lambda (col) + (unless (memq col (table-get-source-info 'colnum-list)) + (table-put-source-info 'colnum-list + (cons col (table-get-source-info 'colnum-list))))) + (list scol ecol)) (insert (format " namest=\"c%d\" nameend=\"c%d\"" scol ecol)))) (if (> rowspan 1) (insert (format " morerows=\"%d\"" (1- rowspan)))) (if (and alignment @@ -3910,19 +3910,19 @@ converts a table into plain text without frames. It is a companion to (remap-alist table-command-remap-alist)) ;; table-command-prefix mode specific bindings (if (vectorp table-command-prefix) - (mapcar (lambda (binding) - (let ((seq (copy-sequence (car binding)))) - (and (vectorp seq) - (listp (aref seq 0)) - (eq (car (aref seq 0)) 'control) - (progn - (aset seq 0 (cadr (aref seq 0))) - (define-key map (vconcat table-command-prefix seq) (cdr binding)))))) - table-cell-bindings)) + (mapc (lambda (binding) + (let ((seq (copy-sequence (car binding)))) + (and (vectorp seq) + (listp (aref seq 0)) + (eq (car (aref seq 0)) 'control) + (progn + (aset seq 0 (cadr (aref seq 0))) + (define-key map (vconcat table-command-prefix seq) (cdr binding)))))) + table-cell-bindings)) ;; shorthand control bindings - (mapcar (lambda (binding) - (define-key map (car binding) (cdr binding))) - table-cell-bindings) + (mapc (lambda (binding) + (define-key map (car binding) (cdr binding))) + table-cell-bindings) ;; remap normal commands to table specific version (while remap-alist (define-key map (vector 'remap (caar remap-alist)) (cdar remap-alist)) @@ -4092,11 +4092,11 @@ key binding --- ------- ") - (mapcar (lambda (binding) - (princ (format "%-16s%s\n" - (key-description (car binding)) - (cdr binding)))) - table-cell-bindings) + (mapc (lambda (binding) + (princ (format "%-16s%s\n" + (key-description (car binding)) + (cdr binding)))) + table-cell-bindings) (print-help-return-message)))) (defun *table--cell-dabbrev-expand (arg) -- 2.39.2