From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 18 Sep 2011 16:03:48 +0000 (-0400)
Subject: Fix yet another woman parser snafu.
X-Git-Tag: emacs-pretest-24.0.90~101
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c940224fe6465158379f951cbee2be4fdd644830;p=emacs.git

Fix yet another woman parser snafu.

* woman.el (woman2-process-escapes): Don't delete unrecognized
escapes (Bug#7843).
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a62a846d172..6b8056ba03f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
 
+	* woman.el (woman2-process-escapes): Don't delete unrecognized
+	escapes (Bug#7843).
+
 	* files.el (inhibit-first-line-modes-regexps): Add image files.
 	(hack-local-variables-prop-line): Return nil for malformed
 	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."
     ;; Done like this to preserve any text properties of the `\'
     (while (search-forward "\\" to t)
       (let ((c (following-char)))
+	;; Some other escapes, such as \f, are handled in
+	;; `woman0-process-escapes'.
 	(cond ((eq c ?')		; \' -> '
 	       (delete-char -1)
 	       (cond (numeric		; except in numeric args, \' -> `
@@ -3967,12 +3969,7 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric."
 	       (insert "\t"))
 	      ((and numeric
 		    (memq c '(?w ?n ?h)))) ; leave \w, \n, \h (?????)
-	      ((eq c ?l) (woman-horizontal-line))
-	      (t
-	       ;; \? -> ? where ? is any remaining character
-	       (WoMan-warn "Escape ignored: \\%c -> %c" c c)
-	       (delete-char -1))
-	      )))
+	      ((eq c ?l) (woman-horizontal-line)))))
     (goto-char from)
     ;; Process non-default tab settings:
     (cond (tab-stop-list