diff options
| author | Chong Yidong | 2011-09-18 12:03:48 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-09-18 12:03:48 -0400 |
| commit | c940224fe6465158379f951cbee2be4fdd644830 (patch) | |
| tree | a0a24091865e9c4dce558455c732e432118808c6 | |
| parent | 56cd55c849f9e08e732b9fdda59e12f58867de04 (diff) | |
| download | emacs-c940224fe6465158379f951cbee2be4fdd644830.tar.gz emacs-c940224fe6465158379f951cbee2be4fdd644830.zip | |
Fix yet another woman parser snafu.
* woman.el (woman2-process-escapes): Don't delete unrecognized
escapes (Bug#7843).
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/woman.el | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a62a846d172..6b8056ba03f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-09-18 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-09-18 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 2 | ||
| 3 | * woman.el (woman2-process-escapes): Don't delete unrecognized | ||
| 4 | escapes (Bug#7843). | ||
| 5 | |||
| 3 | * files.el (inhibit-first-line-modes-regexps): Add image files. | 6 | * files.el (inhibit-first-line-modes-regexps): Add image files. |
| 4 | (hack-local-variables-prop-line): Return nil for malformed | 7 | (hack-local-variables-prop-line): Return nil for malformed |
| 5 | prop-lines (Bug#9044). | 8 | prop-lines (Bug#9044). |
diff --git a/lisp/woman.el b/lisp/woman.el index 75a36d6ac36..7b530d1004f 100644 --- a/lisp/woman.el +++ b/lisp/woman.el | |||
| @@ -3954,6 +3954,8 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric." | |||
| 3954 | ;; Done like this to preserve any text properties of the `\' | 3954 | ;; Done like this to preserve any text properties of the `\' |
| 3955 | (while (search-forward "\\" to t) | 3955 | (while (search-forward "\\" to t) |
| 3956 | (let ((c (following-char))) | 3956 | (let ((c (following-char))) |
| 3957 | ;; Some other escapes, such as \f, are handled in | ||
| 3958 | ;; `woman0-process-escapes'. | ||
| 3957 | (cond ((eq c ?') ; \' -> ' | 3959 | (cond ((eq c ?') ; \' -> ' |
| 3958 | (delete-char -1) | 3960 | (delete-char -1) |
| 3959 | (cond (numeric ; except in numeric args, \' -> ` | 3961 | (cond (numeric ; except in numeric args, \' -> ` |
| @@ -3967,12 +3969,7 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric." | |||
| 3967 | (insert "\t")) | 3969 | (insert "\t")) |
| 3968 | ((and numeric | 3970 | ((and numeric |
| 3969 | (memq c '(?w ?n ?h)))) ; leave \w, \n, \h (?????) | 3971 | (memq c '(?w ?n ?h)))) ; leave \w, \n, \h (?????) |
| 3970 | ((eq c ?l) (woman-horizontal-line)) | 3972 | ((eq c ?l) (woman-horizontal-line))))) |
| 3971 | (t | ||
| 3972 | ;; \? -> ? where ? is any remaining character | ||
| 3973 | (WoMan-warn "Escape ignored: \\%c -> %c" c c) | ||
| 3974 | (delete-char -1)) | ||
| 3975 | ))) | ||
| 3976 | (goto-char from) | 3973 | (goto-char from) |
| 3977 | ;; Process non-default tab settings: | 3974 | ;; Process non-default tab settings: |
| 3978 | (cond (tab-stop-list | 3975 | (cond (tab-stop-list |