[Emacs-diffs] /srv/bzr/emacs/trunk r111450: * lisp/textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):

[Juri Linkov]

------------------------------------------------------------
revno: 111450
fixes bug: http://debbugs.gnu.org/13000
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-09 01:50:40 +0200
message:
  * lisp/textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
  * lisp/progmodes/flymake.el (flymake-errline, flymake-warnline):
  Use underline style wave on terminals that support it. 
  
  * src/xfaces.c (tty_supports_face_attributes_p): Return 0 for the case
  of (supports :underline (:style wave)).
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/progmodes/flymake.el
  lisp/textmodes/flyspell.el
  src/ChangeLog
  src/xfaces.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-01-08 07:14:51 +0000
+++ b/etc/NEWS  2013-01-08 23:50:40 +0000
@@ -205,6 +205,9 @@
 *** Face specs set via Custom themes now replace the `defface' spec
 rather than inheriting from it (as do face specs set via Customize).
 
+*** New face characteristic (supports :underline (:style wave))
+specifies whether or not the terminal can display a wavy line.
+
 ** time-to-seconds is not obsolete any more.
 ** New function special-form-p.
 ** Docstrings can be made dynamic by adding a `dynamic-docstring-function'

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-08 22:26:21 +0000
+++ b/lisp/ChangeLog    2013-01-08 23:50:40 +0000
@@ -1,3 +1,9 @@
+2013-01-08  Juri Linkov  <address@hidden>
+
+       * textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
+       * progmodes/flymake.el (flymake-errline, flymake-warnline):
+       Use underline style wave on terminals that support it.  (Bug#13000)
+
 2013-01-08  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/pcase.el (pcase--split-equal): Also take advantage if

=== modified file 'lisp/progmodes/flymake.el'
--- a/lisp/progmodes/flymake.el 2013-01-01 09:11:05 +0000
+++ b/lisp/progmodes/flymake.el 2013-01-08 23:50:40 +0000
@@ -844,13 +844,21 @@
     has-flymake-overlays))
 
 (defface flymake-errline
-  '((t :inherit error))
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "Red1"))
+    (t
+     :inherit error))
   "Face used for marking error lines."
+  :version "24.4"
   :group 'flymake)
 
 (defface flymake-warnline
-  '((t :inherit warning))
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "DarkOrange"))
+    (t
+     :inherit warning))
   "Face used for marking warning lines."
+  :version "24.4"
   :group 'flymake)
 
 (defun flymake-highlight-line (line-no line-err-info-list)

=== modified file 'lisp/textmodes/flyspell.el'
--- a/lisp/textmodes/flyspell.el        2013-01-01 09:11:05 +0000
+++ b/lisp/textmodes/flyspell.el        2013-01-08 23:50:40 +0000
@@ -445,13 +445,23 @@
 ;;*---------------------------------------------------------------------*/
 ;;*    Highlighting                                                     */
 ;;*---------------------------------------------------------------------*/
-(defface flyspell-incorrect '((t :underline t :inherit error))
+(defface flyspell-incorrect
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "Red1"))
+    (t
+     :underline t :inherit error))
   "Flyspell face for misspelled words."
+  :version "24.4"
   :group 'flyspell)
 
-(defface flyspell-duplicate '((t :underline t :inherit warning))
+(defface flyspell-duplicate
+  '((((supports :underline (:style wave)))
+     :underline (:style wave :color "DarkOrange"))
+    (t
+     :underline t :inherit warning))
   "Flyspell face for words that appear twice in a row.
 See also `flyspell-duplicate-distance'."
+  :version "24.4"
   :group 'flyspell)
 
 (defvar flyspell-overlay nil)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-01-08 19:13:31 +0000
+++ b/src/ChangeLog     2013-01-08 23:50:40 +0000
@@ -1,3 +1,8 @@
+2013-01-08  Juri Linkov  <address@hidden>
+
+       * xfaces.c (tty_supports_face_attributes_p): Return 0 for the case
+       of (supports :underline (:style wave)).  (Bug#13000)
+
 2013-01-08  Aaron S. Hawley  <address@hidden>
 
        * undo.c (Fprimitive_undo): Move to simple.el.

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2013-01-02 16:13:04 +0000
+++ b/src/xfaces.c      2013-01-08 23:50:40 +0000
@@ -4877,6 +4877,8 @@
     {
       if (STRINGP (val))
        return 0;               /* ttys can't use colored underlines */
+      else if (EQ (CAR_SAFE (val), QCstyle) && EQ (CAR_SAFE (CDR_SAFE (val)), 
Qwave))
+       return 0;               /* ttys can't use wave underlines */
       else if (face_attr_equal_p (val, def_attrs[LFACE_UNDERLINE_INDEX]))
        return 0;               /* same as default */
       else