Mercurial > emacs
comparison lisp/woman.el @ 108774:895ee2ff8cc3
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 25 May 2010 07:23:37 +0000 |
parents | d835100c3e8b |
children | fa4400531412 |
comparison
equal
deleted
inserted
replaced
108758:2903660f846b | 108774:895ee2ff8cc3 |
---|---|
2441 ;; Move backwards by deleting space, | 2441 ;; Move backwards by deleting space, |
2442 ;; first backwards then forwards: | 2442 ;; first backwards then forwards: |
2443 (while (and | 2443 (while (and |
2444 (<= (setq N (1+ N)) 0) | 2444 (<= (setq N (1+ N)) 0) |
2445 (cond ((memq (preceding-char) '(?\ ?\t)) | 2445 (cond ((memq (preceding-char) '(?\ ?\t)) |
2446 (delete-backward-char 1) t) | 2446 (delete-char -1) t) |
2447 ((memq (following-char) '(?\ ?\t)) | 2447 ((memq (following-char) '(?\ ?\t)) |
2448 (delete-char 1) t) | 2448 (delete-char 1) t) |
2449 (t nil)))) | 2449 (t nil)))) |
2450 (if (<= N 0) | 2450 (if (<= N 0) |
2451 (WoMan-warn | 2451 (WoMan-warn |
3119 ;; Repeated double-quote represents single double-quote | 3119 ;; Repeated double-quote represents single double-quote |
3120 (while (eq (following-char) ?\") ; paired | 3120 (while (eq (following-char) ?\") ; paired |
3121 (if unquote (delete-char 1) (forward-char)) | 3121 (if unquote (delete-char 1) (forward-char)) |
3122 (re-search-forward "\"\\|$")) | 3122 (re-search-forward "\"\\|$")) |
3123 (if (eq (preceding-char) ?\") | 3123 (if (eq (preceding-char) ?\") |
3124 (if unquote (delete-backward-char 1)) | 3124 (if unquote (delete-char -1)) |
3125 (WoMan-warn "Unpaired \" in .%s arguments." request))) | 3125 (WoMan-warn "Unpaired \" in .%s arguments." request))) |
3126 ;; (re-search-forward "[^\\\n] \\|$") ; inconsistent | 3126 ;; (re-search-forward "[^\\\n] \\|$") ; inconsistent |
3127 (skip-syntax-forward "^ ")) | 3127 (skip-syntax-forward "^ ")) |
3128 (cond ((null concat) (skip-chars-forward " \t")) ; don't skip eol! | 3128 (cond ((null concat) (skip-chars-forward " \t")) ; don't skip eol! |
3129 ((eq concat 'noskip)) ; do not skip following whitespace | 3129 ((eq concat 'noskip)) ; do not skip following whitespace |
4344 "Insert spaces to next defined tab-stop column. | 4344 "Insert spaces to next defined tab-stop column. |
4345 The variable `tab-stop-list' is a list whose elements are either left | 4345 The variable `tab-stop-list' is a list whose elements are either left |
4346 tab stop columns or pairs (COLUMN . TYPE) where TYPE is R or C." | 4346 tab stop columns or pairs (COLUMN . TYPE) where TYPE is R or C." |
4347 ;; Based on tab-to-tab-stop in indent.el. | 4347 ;; Based on tab-to-tab-stop in indent.el. |
4348 ;; R & C tabs probably not quite right! | 4348 ;; R & C tabs probably not quite right! |
4349 (delete-backward-char 1) | 4349 (delete-char -1) |
4350 (let ((tabs tab-stop-list)) | 4350 (let ((tabs tab-stop-list)) |
4351 (while (and tabs (>= (current-column) | 4351 (while (and tabs (>= (current-column) |
4352 (woman-get-tab-stop (car tabs)))) | 4352 (woman-get-tab-stop (car tabs)))) |
4353 (setq tabs (cdr tabs))) | 4353 (setq tabs (cdr tabs))) |
4354 (if tabs | 4354 (if tabs |
4398 (while (re-search-forward delim end t) | 4398 (while (re-search-forward delim end t) |
4399 (goto-char (match-beginning 0)) | 4399 (goto-char (match-beginning 0)) |
4400 (delete-char 1) | 4400 (delete-char 1) |
4401 (insert woman-unpadded-space-char) | 4401 (insert woman-unpadded-space-char) |
4402 (goto-char (match-end 0)) | 4402 (goto-char (match-end 0)) |
4403 (delete-backward-char 1) | 4403 (delete-char -1) |
4404 (insert-before-markers woman-unpadded-space-char) | 4404 (insert-before-markers woman-unpadded-space-char) |
4405 (subst-char-in-region | 4405 (subst-char-in-region |
4406 (match-beginning 0) (match-end 0) | 4406 (match-beginning 0) (match-end 0) |
4407 pad woman-unpadded-space-char t))))) | 4407 pad woman-unpadded-space-char t))))) |
4408 (woman2-format-paragraphs to)) | 4408 (woman2-format-paragraphs to)) |